NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 20:14:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Resources/Prototypes/Maps
History
Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
..
Pools Derotate Core pending improvement. (#20262) 2023-09-16 14:09:05 -06:00
arenas.yml 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467) 2023-08-30 18:06:15 -07:00
aspid.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
bagel.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 05:58:14 +03:00
barratry.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-05 19:37:38 +03:00
box.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 05:58:14 +03:00
centcomm.yml Refactor stations to properly use entity prototypes. (stationsv3) (#16570) 2023-05-19 15:45:09 -05:00
cluster.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
core.yml Fix Core IAA jobs count (#1526) 2023-10-25 15:15:48 +03:00
debug.yml Adds the thermo-electric generator (#18840) 2023-08-12 15:41:55 -05:00
europa.yml Replace Lawyer with IAA for Europa station (#1413) 2023-09-13 23:51:33 +03:00
fland.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 05:58:14 +03:00
kettle.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-11 16:56:19 +03:00
marathon.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 05:58:14 +03:00
meta.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-29 05:58:14 +03:00
omega.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-24 22:01:46 +03:00
origin.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
packed.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-24 22:01:46 +03:00
saltern.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
salvage.yml Security Chunk Salvage (#21403) 2023-11-03 14:06:19 -06:00