Ed
36916b0952
returns ru CBT
2025-02-22 00:51:50 +03:00
Ed
1c433ed581
Eng OBT ( #930 )
...
* fuck sociopath and grass seel position
* Update PostMapInitTest.cs
* fix
* en obt
2025-02-21 20:29:37 +03:00
KittenColony
93350c80e8
Alchemy Remaster - Foundation (T0 / T1) ( #827 )
...
* Ported from broken repo
* Missed something
* Unfucks the port
* RU locale + EN typo fixes
* Simple solvent & Dye temperature / orgnization
* cleansing salt + reactions
* Healing solution stems bleeding
* Removed biological.yml duplicate
* Guidebook updating
* Update dye_brewing.yml
* Single character typos
* missed typos
* Salt dehydrating
* Dye now needs water (catalyst) to form
* Biological > Organic, Archaic > Arcane / Alchemized,+ RU Locale
* Adjusting & patches
* Chromium in Arcane
* Removed 0.1u empty from purification
* Update chromium_slime.yml
* test commenting out
* Uncommenting InverseEffect
* Revert "Uncommenting InverseEffect"
This reverts commit 19aaaa924696445749+TheShuEd@users.noreply.github.com >
2025-02-21 17:58:40 +03:00
Nim
a39ea84e78
aprons ( #926 )
2025-02-21 17:38:03 +03:00
Deserty0
b8cc4c8c20
Fix ( #922 )
2025-02-20 19:22:29 +03:00
Deserty0
225d9b27f9
fix ( #923 )
2025-02-20 19:21:50 +03:00
creamybag
d32ed931b3
lightgreendress ( #919 )
...
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-20 15:44:45 +03:00
creamybag
b29cfaf2a8
Winter is coming... ( #918 )
2025-02-20 02:12:17 +03:00
Nim
88462e5a1b
Modular arrows ( #906 )
...
* arrow
* sprite
* slots
* migration
* fix
* fix2
* del
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-19 22:36:21 +03:00
Nim
dfd1603b64
meat and damag ( #916 )
...
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-19 22:16:35 +03:00
Nim
275cff86b7
New crossbolt ( #912 )
...
* bolt
* eee
* closets
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-19 22:15:39 +03:00
Ed
224d96bd34
Sociopath delete ( #917 )
...
* fuck sociopath and grass seel position
* Update PostMapInitTest.cs
* fix
2025-02-19 21:56:29 +03:00
creamybag
fa21ad93ff
added ( #914 )
...
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-18 17:41:41 +03:00
Ed
72c0a51f60
Master fix ( #913 )
...
* loadmap fixes
* Update PostMapInitTest and CP14StationZLevelsSystem to enhance map whitelisting and initialization
* fix #907
* Update PostMapInitTest.cs
2025-02-18 16:49:57 +03:00
Ed
7a3ff80c88
Merge pull request #905 from crystallpunk-14/ed-16-02-2025-planet-light-upstream
...
Ed 16 02 2025 planet light upstream
2025-02-17 17:35:23 +03:00
Nim
41b392035f
fix ( #910 )
2025-02-17 17:35:06 +03:00
Ed
ce93413a17
Merge branch 'master' into ed-16-02-2025-planet-light-upstream
2025-02-17 14:51:41 +03:00
Viator-MV
2d6b39868f
Comoss update 17.02.25 ( #911 )
...
* Update comoss.yml
* Update comoss_d.yml
2025-02-17 14:50:53 +03:00
Ed
a827e9faff
Update PostMapInitTest.cs
2025-02-17 12:24:14 +03:00
Ed
596d9e808b
arenas fix
2025-02-17 11:57:01 +03:00
Ed
57e8991799
Update PostMapInitTest.cs
2025-02-17 11:43:41 +03:00
Nim
970dc7bb1f
Sack new ( #822 )
...
* new
* tag
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-17 10:46:09 +03:00
Ed
eb7e0961f1
Update SharedProjectileSystem.cs
2025-02-16 23:56:08 +03:00
Ed
2d9f67c354
DoNotMap category
2025-02-16 23:54:55 +03:00
Ed
7d6d02c523
throw spells now detach embeddables
2025-02-16 23:12:31 +03:00
Ed
82d6fe07fe
roof adapt
2025-02-16 22:56:10 +03:00
Ed
9e32136cd0
Update Dev.toml
2025-02-16 20:57:17 +03:00
Ed
01900bf2ec
Update comoss_d.yml
2025-02-16 18:06:20 +03:00
Ed
f776770164
Update T0_counter_spell.yml
2025-02-16 16:55:07 +03:00
Ed
bc53ed4aa5
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Resources/Prototypes/Maps/centcomm.yml
2025-02-16 16:39:26 +03:00
Ed
31f02b3de3
Update Dev.toml
2025-02-16 16:30:13 +03:00
PJBot
8a685483e7
Automatic changelog update
2025-02-16 13:30:11 +00:00
Ed
6d13f4280f
alchemy buff
2025-02-16 16:29:14 +03:00
metalgearsloth
ead32b5770
Apply RoofOverlay per-grid not per-map + fix lighting quality ( #35207 )
...
* Apply RoofOverlay per-grid not per-map
* Fix light render scales
2025-02-16 16:29:03 +03:00
Leon Friedrich
a9f900c397
"DO NOT MAP" items integration test ( #34711 )
2025-02-17 00:02:05 +11:00
ElectroJr
b43cb069e9
Expand whitelist
2025-02-17 01:45:14 +13:00
ElectroJr
81ff9bdda0
Fix merge conflict
2025-02-17 01:38:32 +13:00
ElectroJr
afc41947a7
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/34711
2025-02-17 01:16:22 +13:00
Leon Friedrich
4169a6d855
Update engine to v247.0.0 ( #35204 )
2025-02-16 22:26:00 +11:00
ElectroJr
7d42b2ba51
Update engine to v247.0.0
2025-02-17 00:22:53 +13:00
Ed
d6a0ce95a1
Update CP14RoofSystem.cs
2025-02-16 14:10:59 +03:00
Viator-MV
5f107d176e
Comoss update for obt 16.02.25 ( #904 )
...
* Update comoss.yml
* Update comoss_d.yml
2025-02-16 14:10:00 +03:00
Leon Friedrich
bcb82fc4ad
Update permissions for engine toolshed PR ( #34029 )
2025-02-16 21:54:59 +11:00
ElectroJr
a556f03808
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into toolshed-eng-pr
2025-02-16 23:43:27 +13:00
Leon Friedrich
2bd7bb17f2
Refactor map loading & saving ( #34020 )
2025-02-16 21:36:35 +11:00
Saphire Lattice
d4911309cd
Add health analyzer unrevivability warning ( #32636 )
...
* Add health analyzer unrevivability warning
* Remove errornous comment
2025-02-16 13:10:39 +03:00
Ed
d75b30b2a6
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
2025-02-16 12:55:34 +03:00
Simon
29029d2586
Add ability for admins to change certain cvars via command. ( #35105 )
...
* Add ability for admins to change certain cvars via command.
* Cleanup
* More cleanup.
* Even more cleanup.
* WAITER! WAITER! ONE MORE COMMIT PLEASE!
* Remove requirement for Admin AdminFlag
Not needed as the command checks for the perms.
* Add search function to CVars and help text
* Move to controller instead.
* Add another cvar for testing
* Remove unused comment
* Move to Post Server Initialize
LoC does not work at the earlier stages of server initalization
* Remove unneeded comment
We clear out list so its no longer needed
2025-02-16 10:06:13 +01:00
Ed
7328f3449c
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/EntityTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Procedural/DungeonSystem.Rooms.cs
# Content.Server/Procedural/RoomFillComponent.cs
# Content.Server/Procedural/RoomFillSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/migration.yml
2025-02-16 11:58:47 +03:00
metalgearsloth
5e2015e342
Update submodule to 246.0.0 ( #35202 )
2025-02-16 19:48:59 +11:00
