rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/Construction
History
Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
..
Commands Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814) 2025-07-07 21:57:05 +02:00
Completions Construction spring cleaning (#36163) 2025-04-16 13:02:41 +02:00
Components Machine-code cleanup (#28489) 2024-06-05 16:23:23 -04:00
Conditions predict morgue and crematorium (#39293) 2025-08-21 16:49:50 -07:00
ConstructionSystem.Computer.cs Clean up all missing EntitySystem proxy method uses (#38353) 2025-06-26 16:50:49 -07:00
ConstructionSystem.cs Clean up all missing EntitySystem proxy method uses (#38353) 2025-06-26 16:50:49 -07:00
ConstructionSystem.Graph.cs Clean up all missing EntitySystem proxy method uses (#38353) 2025-06-26 16:50:49 -07:00
ConstructionSystem.Guided.cs Machine-code cleanup (#28489) 2024-06-05 16:23:23 -04:00
ConstructionSystem.Initial.cs Merge remote-tracking branch 'space-wizards/master' 2025-08-10 01:49:23 +03:00
ConstructionSystem.Interactions.cs Borg hands & hand whitelisting (#38668) 2025-08-12 15:21:42 -07:00
ConstructionSystem.Machine.cs Machine-code cleanup (#28489) 2024-06-05 16:23:23 -04:00
ConstructionSystem.Pathfinding.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
FlatpackSystem.cs Фикс упаковщика 2025-01-04 08:26:08 +03:00
MachineFrameSystem.cs CompFactory updates (#37559) 2025-05-20 01:08:55 -04:00