Ed
b8b17f7b8a
Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Nutrition/Components/FoodComponent.cs
# Content.Shared/Speech/ListenEvent.cs
# Resources/Prototypes/Entities/Effects/admin_triggers.yml
2025-08-25 16:22:32 +03:00
slarticodefast
2e0b11ea51
fix repeated scale visuals removal/ensuring ( #39432 )
2025-08-06 20:54:50 +02:00
slarticodefast
71f21d96f7
Move scale command to content and turn it into a toolshed command ( #39349 )
...
* scale command
* fix namespaces
2025-08-06 14:33:21 +02:00
Ed
dd84d48fed
Refactors, bugfixs + Crystals ( #127 )
...
* fix dwarf displacement map
* Big Fireplace update
* add crystalls placeholder
* bonfire update
* displaccement update
* Update wallmount_torch.yml
2024-05-03 20:40:31 +03:00
deathride58
4d0d2e4c5a
Kobold variety - allows kobolds to have random colors and horns (+ allows RandomSpriteComponent to uh. Actually choose random sprites for specific layers) ( #23393 )
...
* kobold variety - allows kobolds to have random colors and horns
* hey lets maybe not crash in this case, lets maybe let the color continue being null in this case
* excuse us vscode what the fuck is this
* brightens kob base, makes kob outline more bold, fixes to the prototype because our code spaghett
* okay yeah angler horns just dont work At All. the floppy kobold ears, however? MWAH. chef's kis
* we've been staring at these critters all day - makes base color line up with the base color of some of the markings
2024-01-03 17:39:00 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Nemanja
4c2b521c90
Water gun cargo crate ( #16172 )
2023-05-07 13:14:54 +10:00
metalgearsloth
3400af11cd
Add sprite fades for occluding sprites ( #13267 )
2023-01-05 16:45:23 +11:00
metalgearsloth
a29d8b9fa2
Carp wave spawner and dragons as an actual event ( #10254 )
2022-08-08 10:18:14 +10:00
