comasqw
fff4287ad5
ревёрт "demiplane modifiers", всё же нужно делать биом
2024-12-12 01:07:35 +04:00
comasqw
d1e4501b6f
Merge branch 'master' into MagicWands
2024-12-12 00:59:47 +04:00
comasqw
fc4f51f0dd
demiplane modifiers
2024-12-12 00:58:55 +04:00
Ed
c42b77d0c9
Merge pull request #658 from crystallpunk-14/ed-11-12-2024-upstream
...
Upstream sync
2024-12-11 21:18:17 +03:00
Ed
6c8b0a07f3
yep
2024-12-11 21:17:43 +03:00
comasqw
06cb93fb1d
recipes for workbench
2024-12-11 16:34:09 +04:00
Ed
af918c1253
Update audio_music.yml
2024-12-11 14:53:49 +03:00
Ed
cd736e4fd4
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Maps/oasis.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/audio.yml
2024-12-11 14:49:02 +03:00
Ed
576bbe91d0
Roofs ( #657 )
...
* simple roo system
* tweaks
* roof sprite update
* transparent roof
* wooden roof sprite
* remove weather: false from all tiles
* stone roof + roofs crafting
* final shtrix, maps update
* fuck
* fix checks
* reagent auto vaporize tweaks
* Update base.yml
2024-12-11 14:44:16 +03:00
comasqw
14dbb5d3ed
added all modular parts
2024-12-11 13:27:33 +04:00
comasqw
337d248884
added magic crystals for all spells
2024-12-11 00:15:19 +04:00
Ed
e4b60b31c0
Ed 10 12 2024 aah ( #656 )
...
* fix ghost zlevel moving
* stairways autorotation
* ladders sprite update
* slow space swimming
* fix wrong wood spawn
* deadly ocean
* Update zLevels.yml
2024-12-10 21:24:06 +03:00
comasqw
596c329c96
new staff
2024-12-10 17:37:43 +04:00
comasqw
bae34b8318
bup
2024-12-10 01:58:47 +04:00
comasqw
e7e4e61972
magic artifacts
2024-12-10 01:57:41 +04:00
Ed
99786342fb
Comoss sewers (zlevels added) ( #655 )
...
* comoss zlevel sewers
* Update biome_template_caves.yml
* Update GhostSystem.cs
* Update GhostSystem.cs
2024-12-10 00:43:30 +03:00
Ed
bec8d7a7d4
Ghost z-levels move actions + mapping z-levels combine command ( #654 )
...
* some setup
* fast ghost zlevels-moving
* zlevel combine command for mapping
2024-12-09 20:39:46 +03:00
comasqw
fc90485838
Merge branch 'master' into MagicWands
2024-12-09 21:35:22 +04:00
comasqw
ac5579c7fd
added base old magic scroll
2024-12-09 21:34:28 +04:00
comasqw
cd618efc31
update crystals modalrPart structure
2024-12-09 20:59:59 +04:00
ScarKy0
3844352fee
Derelict icon hotfix ( #33768 )
...
whoops
2024-12-09 13:56:25 +01:00
Ed
5384adb2b3
Blacksmith again ( #652 )
...
* golden and copper sword
* copper sickle
* maces
* shovels
* modular axes
* fixes
2024-12-09 00:40:27 +03:00
Ed
c2b7c5146d
second blacksmith
2024-12-08 14:43:12 +03:00
Ed
61454e351c
Another blacksmith minor update ( #648 )
...
* modular golden sickle
* anvil and furnace resprite
* Update comoss.yml
2024-12-08 14:17:48 +03:00
Ed
0662299120
Aftertest tweaks ( #647 )
...
* fix #641
* fix #639
* add copper, bloodflowers and wild sage into comoss island
* remove additional alchemist and blacksmithes roles
* more roundstart resources for alchemist and blacksmith
* disable footprints system
* cryo shuttle mechanic
* update cargo ship
* veryy magical
* tips update
* fix #635
* green cloak
* Update T0_cure_poison.yml
2024-12-08 00:52:35 +03:00
Ed
264ef809bd
Update personal_objectives.yml
2024-12-07 20:49:51 +03:00
Ed
15017b7c4f
personal key loadout
2024-12-07 14:49:02 +03:00
Nim
417668b88b
Crayon ( #634 )
...
* crayon
* add crayon into loots
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-12-07 00:50:54 +03:00
Ed
52a0f44aa1
Bank progression mechanic ( #633 )
...
* bank progression mechanic
* loc fix
* minor random fixes
* minor tweaks
* lighthouse
* Vladimirs Alerts!
* offset alerts
* lighthouse
2024-12-07 00:39:05 +03:00
deltanedas
3300ff2a06
clean up random lathe recipes ( #31525 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-12-06 16:45:01 +01:00
MilenVolf
b66fd98514
Localize ai dataset names ( #33608 )
...
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-12-06 16:38:00 +01:00
K-Dynamic
e244472546
Samurai dogi is now major contraband ( #33699 )
2024-12-06 16:36:26 +01:00
0tito
de19418126
Add Sprite changes to Logic Gates to show the input/output state ( #33277 )
2024-12-06 16:35:48 +01:00
Ed
02cbeee6dc
Demiplane fixes ( #632 )
...
* limit demiplace wshwooshing by interaction range, fix global gibbing
* Update base.yml
* fix #521
2024-12-06 17:16:38 +03:00
Southbridge
623a35b3fe
Amber Station - Added Evac Shuttle ( #33743 )
...
* Added evac shuttle and fixed various issues brought up during playtests
* Updated Amber with playtest feedback, removed waste loop and firelocks from evac shuttle
2024-12-06 01:39:25 -07:00
ScarKy0
274c3ab0b9
Derelict Borg Revival ( #33433 )
...
* Derelictn'tn't Borg!
* Clean *sparkles*
* Removed "S: Awaiting Changes"
2024-12-06 00:22:38 -06:00
Winkarst
52a886947f
Add a maintenance panel to bar signs ( #33467 )
...
* Add a maintenance panel to bar signs
* Update Resources/Locale/en-US/wires/wire-names.ftl
* AI interactions
---------
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-12-05 23:27:52 -06:00
MilenVolf
d6ba7598bd
Fix name duplications ( #33740 )
...
* Fix name duplication
* Apply requested changes
2024-12-05 23:19:27 -06:00
Velcroboy
207c849e2d
Adds Station Anchor Beacon ( #33711 )
...
Co-authored-by: Velcroboy <velcroboy333@hotmail.com >
2024-12-05 22:56:34 -06:00
Ed
64df860b50
Salary for the guards ( #631 )
...
* public API
* salary init
* salary finish
* Update entities.ftl
* Update salary.yml
2024-12-06 00:59:37 +03:00
IProduceWidgets
8f3973b2eb
set n2 survival box sprite layers ( #33733 )
2024-12-05 22:39:39 +01:00
Pieter-Jan Briers
dc8b859916
Give vox health regen for poison below 20 damage ( #33722 )
2024-12-05 22:17:27 +01:00
Ed
ce34c6f2a0
Update lockTypes.yml
2024-12-05 21:25:34 +03:00
Ed
8252418fdc
Update personalHouse.yml
2024-12-05 18:19:10 +03:00
Ed
304e1a268a
Balance pack ( #628 )
...
* map fixes, move crystalls from houses into startgear
* fix lock types
* fix item throwing, reduce lock powers, add lockpick into anvil
* new store positions
* restruct swords
* nerf skeleton, bone halberd
2024-12-05 00:29:14 +03:00
comasqw
6b41aa71ca
change ManacostModify
2024-12-05 01:23:47 +04:00
comasqw
a4395f2066
Merge branch 'master' into MagicWands
2024-12-05 00:46:27 +04:00
comasqw
685a9616ab
много чего
2024-12-05 00:41:23 +04:00
keronshb
82528dce37
Adds Store on Collide and Wand of the Locker ( #33710 )
...
* Adds wand of locker and locker projectile
* Adds IsOpen method to check if storage is open
* Adds store on collide
* Adds Store On Collide to Wizard Locker
* Adds Lock API
* Adds locking support
* Adds resist override and custom visual layers
* Fixes decursed states, adds comment for a future visualizer
* adds locker wand visuals and descriptions
* shrinks locker radius, moves TODO for throw support
* Adds whitelist and moves storage and lock logic into their own methods
* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.
* Adds wand of locker to the grimoire
* Adds wizard access prototype
* Adds Wizard to universal access
* Moves Lock on collide to on collide method
* Comments
* Changes layer order
* Fixes prediction issues when locking.
* Adds Wiz access to universal ID
2024-12-04 17:49:54 +01:00
A.Ne.
e6a6900719
Prototypes for Guard ( #616 )
...
* Prototypes for Guard
* imperial laws
* merge
* yml clean up
* flags + change in imperial laws
* map update
* guard clothing resprite
* cool guard helmet
* guards grip and halberd
* fill cabinets, add guard commander stamp
* key and keyring fix
* Update arenas.yml
* Update migration.yml
* tapestry fix
* guidebook spacing
* Update meta.json
* add bold tags
* Update flags_wallmount.yml
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-12-04 18:11:33 +03:00
