Ed
ef6d973301
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
...
# Conflicts:
# Content.Client/Parallax/ParallaxControl.cs
# Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/Labels/Label/LabelSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/Pools/deathmatch.yml
# Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
Hanz
bd1f2af691
Ashtray Resprite and Fix ( #31643 )
...
* The meat and potatoes
Yup
* Stupid recycler
bruh
* guh
guh
2025-04-22 15:34:39 -04: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
Ps3Moira
b2a6d5c1b0
Cabinetification ( #34293 )
...
* Resprite Boxes and Icons + Remove Boxes
* Update Meta
* Update Flatpacks
* Update Shotgun Ammo Boxes
* Remove Leftover Ammo Box Icons
* Update Donk Pocket Boxes
* Update Briefcase
* Update Happyhonk + Remove Open Sprites
* Update Medal Case
* Update Cigarette Packs
* Update Cigarette Cartons
* Update Medkits
* fix positioning for medkits
* Update Junk Medkit
* Update Present
* Tweak Rad and Burn Medkits
* Tweak Briefcase
* Update Toolboxes
* Update Decoy Boxes
* Fix Meta for Healing toolbox
* Update Cow tool box
* Update Donut Box
* Removal of left over rubber bullet sprites and duplicate ammo box sprites
* Removal of Duplicate Ammo Boxes
* Update .20 rifle ammo box
* Update .35 ammo box + fix meta
* Update .45 magnum ammo box Sprites
* Update .25 caseless ammo
* Remove leftover box
* Update cargo_service.yml
* Fix Icon Cigs
* fix big .20 ammo box
* Update Black Cigs Pack
* Update Cig Placement
* Update Blue Cigs
* Update Cig Packs
* Re-Add Big Ammo box for the USA guns vending machine lol
* Remove 10x24 mention in migration.yml
* Update Big Cig Cartons
* Remove Toolbox Changes
2025-02-04 00:52:10 -07:00
Ed
4173d96d83
Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.IntegrationTests/Tests/ResearchTest.cs
# Resources/Prototypes/Entities/Objects/Decoration/flora.yml
# Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
# Resources/Prototypes/Maps/Pools/default.yml
2024-12-22 15:48:30 +03:00
Ed
af7e552d3c
Flora clean up ( #33839 )
...
* first migrate
* clean up prototypes
* Update polymorph.yml
* Update flora.yml
* and this one
* and this one x2
* and this one x3
* Update migration.yml
2024-12-16 20:20:36 +01:00
vladimir.s
8d022dd502
Wooden objects and structures resprite ( #436 )
2024-09-17 13:06:34 +03:00
rosieposie
e94d190ade
Stalagmite Changes ( #25646 )
...
* initial commit
* remove unnecessary thing
* Revert "remove unnecessary thing"
This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.
* fix (real)
2024-02-27 22:24:17 +03:00
Ed
656679cb54
Flora anomaly nerf ( #25499 )
...
* Update kudzu.yml
* Update living_light.yml
* files
* Update flora.yml
* Update kudzu.yml
* bul
* Update kudzu.yml
* Update living_light.yml
* bullet immune
2024-02-25 15:41:24 -08:00
icekot8
77c10185bb
artifact effect fauna and flora spawn ( #23295 )
...
* adding EffectFaunaSpawn
* add spawn flora effect, blood trigger
* fix
removed the bloody trigger
* fix
oh, I hope this solves the problem.
* I added an icon sprite..
* fix
I'm stupid..
* final touch...
2023-12-31 22:40:49 -08:00
Guilherme Ornel
fb47c4c83b
Added ashtrays ( #22837 )
...
added
2023-12-21 21:21:01 -07:00
Ed
354d999c8e
Cave Decoration pack ( #21265 )
...
* add chromite chasm
* add desert chasm
* snow chasm
* finish
2023-10-26 21:58:27 -04:00
Ed
94cda6a253
Shadow Dimension visual pack ( #21237 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2023-10-26 00:36:22 +11:00
ZeroDayDaemon
b2792cf3ad
Salami Lid ( #7813 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2022-05-12 20:24:48 +10:00
Delete69
722a408c41
Flora: rock fix ( #7333 )
2022-04-05 17:22:18 +10:00
Delete69
255192caf7
Trees and flora ( #7281 )
2022-03-28 13:53:13 -07:00
shaeone
43eb542a60
Added a decorated fir tree and a present ( #5694 )
...
* Added a decorated fir tree and a present
* Update meta.json of the tree
* Update Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
* Present PNGs changed
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
2021-12-13 13:21:15 -08:00
