Commit Graph

40156 Commits

Author SHA1 Message Date
EmeraldSundisk ab260dcdec Add files via upload 2020-12-29 12:30:09 -08:00
EmeraldSundisk 6c5c342bb8 Update CogStation.dmm 2020-12-29 12:20:25 -08:00
EmeraldSundisk b1f76a8566 Update Space_Station_13_areas.dm 2020-12-29 11:38:07 -08:00
EmeraldSundisk 0707f6ecfc Update Space_Station_13_areas.dm 2020-12-29 10:56:58 -08:00
EmeraldSundisk 6af5d180d0 Update Space_Station_13_areas.dm 2020-12-29 10:29:28 -08:00
EmeraldSundisk 3fdcccca56 Merge pull request #73 from Citadel-Station-13/master
12/29
2020-12-29 10:18:35 -08:00
CitadelStationBot 29c24fc1cd Automatic changelog generation for PR #13884 [ci skip] 2020-12-29 02:28:43 -06:00
silicons a7ed197675 Merge pull request #13884 from Hatterhat/are-you-fucking-kidding-me
":n hey miners don't forget the dock silver" the PR - also includes a box whiteship tinyfan fix
2020-12-29 01:28:39 -07:00
silicons 2e071b1e0b Merge pull request #13908 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-12-29 01:28:12 -07:00
CitadelStationBot 3ba7740641 Automatic changelog generation for PR #13855 [ci skip] 2020-12-29 02:27:52 -06:00
silicons da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
CitadelStationBot 5a0a9393a5 Automatic changelog generation for PR #13900 [ci skip] 2020-12-29 01:51:01 -06:00
silicons a0fb594236 Merge pull request #13900 from Xantholne/Birds
Ports cute birbs from RP
2020-12-29 00:50:58 -07:00
tgstation-server 14cefb2d35 Update TGS DMAPI 2020-12-29 00:59:40 +00:00
DeltaFire 1772c83a75 Merge pull request #13906 from silicons/sigh9
fixes the admin panel (tickets, sdq2l)
2020-12-28 22:36:59 +01:00
CitadelStationBot 627ac9dc31 Automatic changelog generation for PR #13904 [ci skip] 2020-12-28 14:53:49 -06:00
silicons cc0556267e Merge pull request #13904 from DeltaFire15/summonitem-stuff
Adds some more instant summons safety
2020-12-28 13:53:46 -07:00
silicons dc7f3cdd6b sigh 2020-12-28 12:52:41 -08:00
CitadelStationBot 4e51f914f5 Automatic changelog generation for PR #13869 [ci skip] 2020-12-28 14:15:33 -06:00
silicons 1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -07:00
DeltaFire 687c6a9e6f and another one 2020-12-28 19:49:42 +01:00
DeltaFire 0bba554052 e 2020-12-28 19:45:03 +01:00
Timothy Teakettle b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00:00
DeltaFire b1be0159e2 Merge pull request #13877 from Citadel-Station-13/silicons-patch-43
heretics uses killonce objectives
2020-12-28 17:56:58 +01:00
DeltaFire 13cd2c4424 Merge pull request #13880 from Citadel-Station-13/silicons-patch-46
antag rep configs are now actually possible to set for jobs with more than one word in the title
2020-12-28 17:56:17 +01:00
CitadelStationBot e32f0a613f Automatic changelog generation for PR #13882 [ci skip] 2020-12-28 10:55:30 -06:00
DeltaFire 3435a99ec7 Merge pull request #13882 from silicons/subtler_tables
adds subtler emote that wraps around adjacent tables
2020-12-28 17:55:27 +01:00
CitadelStationBot eb8bb6c678 Automatic changelog generation for PR #13883 [ci skip] 2020-12-28 10:53:35 -06:00
DeltaFire 999b4c403b Merge pull request #13883 from silicons/temporary_flavortext
Set Pose from RP server is now a thing (in reality this just modifies existing temporary flavor text to be better but no one here understands enough code so I'll spare the explanation)
2020-12-28 17:53:32 +01:00
DeltaFire f89edd5c10 Merge pull request #13886 from Citadel-Station-13/silicons-patch-47
respawn text now shows AFTER motd (probably)
2020-12-28 17:46:36 +01:00
CitadelStationBot 0e9a29fc15 Automatic changelog generation for PR #13887 [ci skip] 2020-12-28 10:43:41 -06:00
DeltaFire 312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
DeltaFire a390816092 Merge pull request #13888 from Citadel-Station-13/silicons-patch-48
adds vv wrapper for snowflake plushies
2020-12-28 17:42:26 +01:00
DeltaFire 9b6d4c1371 Merge pull request #13889 from Citadel-Station-13/silicons-patch-49
adds recursive pulling check to space transitions
2020-12-28 17:39:59 +01:00
CitadelStationBot 8f0a526ee1 Automatic changelog generation for PR #13898 [ci skip] 2020-12-28 10:34:17 -06:00
DeltaFire 58accc3782 Merge pull request #13898 from Putnam3145/fix-coma-sleep
Makes regen coma properly work at 25% when sleeping; makes coma more precedent
2020-12-28 17:34:14 +01:00
CitadelStationBot 0b975ef6de Automatic changelog generation for PR #13896 [ci skip] 2020-12-28 10:15:52 -06:00
DeltaFire bd0c799e66 Merge pull request #13896 from Sonic121x/patch-3
cydonia helmet fix & taur(naga&canine)Ert hardsuit
2020-12-28 17:15:49 +01:00
CitadelStationBot 73c71d9969 Automatic changelog generation for PR #13894 [ci skip] 2020-12-28 10:11:36 -06:00
DeltaFire 8b723ab6c7 Merge pull request #13894 from Citadel-Station-13/silicons-patch-52
reduces coldslowdown to tempdiff / 35 instead of tempdiff / 20
2020-12-28 17:11:33 +01:00
CitadelStationBot 21cfa42f91 Automatic changelog generation for PR #13893 [ci skip] 2020-12-28 10:10:29 -06:00
DeltaFire 49252f4eff Merge pull request #13893 from Citadel-Station-13/silicons-patch-51
Nerfs meth and morphine to only remove damage slowdown rather than all slowdown (read this carefully, as this affects lings)
2020-12-28 17:10:26 +01:00
CitadelStationBot a48e8265b0 Automatic changelog generation for PR #13897 [ci skip] 2020-12-28 10:08:32 -06:00
DeltaFire 8843a830d2 Merge pull request #13897 from keronshb/energybolafix
Fixess Energy Bola to be catchable
2020-12-28 17:08:29 +01:00
CitadelStationBot f5c4bd614d Automatic changelog generation for PR #13838 [ci skip] 2020-12-28 09:57:14 -06:00
DeltaFire 3a7cda80b7 Merge pull request #13838 from Citadel-Station-13/silicons-patch-32
removes deathgasping on death if already faking death as it's real easy to spot changelings in stasis otherwise
2020-12-28 16:57:11 +01:00
DeltaFire 9857144b42 Merge pull request #13901 from Citadel-Station-13/silicons-patch-54
woops i accidentally gave every single goddamn person pugilist parry
2020-12-28 16:31:21 +01:00
Chiirno 1df5aefcd9 re-added replacement lights to Starboard Emergency Storage 2020-12-28 05:49:17 -04:00
Xantholne 51ac7286e6 aaaaaaa 2020-12-28 00:57:32 -07:00
silicons e8fea4cf1b Update human_defines.dm 2020-12-28 00:19:35 -07:00