Commit Graph

19663 Commits

Author SHA1 Message Date
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
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
Xantholne
2cca3314a7 Adds to bird crate 2020-12-27 23:55:58 -07:00
Xantholne
121b1bb7fd Ports parrots from RP 2020-12-27 22:51:18 -07:00
Letter N
ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00
Timothy Teakettle
b03bd6fe8e Update preferences.dm 2020-12-27 22:03:28 +00:00
Sonic121x
1afcc2cd4c Update hardsuit.dm 2020-12-28 04:46:25 +08:00
Sonic121x
b51a2e939e Update miscellaneous.dm 2020-12-28 04:21:52 +08:00
Sonic121x
ad9fc238e7 Update hardsuit.dm 2020-12-28 04:19:37 +08:00
Timothy Teakettle
67741b7561 Update preferences_savefile.dm 2020-12-27 20:09:32 +00:00
silicons
8d981bfa82 high cooldown on failure 2020-12-27 12:05:32 -08:00
silicons
005f7e2d6d Update reagents.dm 2020-12-27 12:52:52 -07:00
silicons
c4de817870 Update drink_reagents.dm 2020-12-27 12:48:02 -07:00
silicons
94b3f03b24 Update drug_reagents.dm 2020-12-27 12:45:57 -07:00
silicons
ea519b379c Update reagents.dm 2020-12-27 12:45:07 -07:00
silicons
952f5f8716 Update drug_reagents.dm 2020-12-27 12:32:14 -07:00
silicons
3f026749c8 Update mutations.dm 2020-12-27 12:15:17 -07:00
silicons
824427ce2f Update mutations.dm 2020-12-27 12:11:27 -07:00
silicons
4da7a3867c fix 2020-12-27 10:22:27 -08:00
silicons
12145e0609 no ops 2020-12-27 10:15:52 -08:00
silicons
53253bfce1 changes 2020-12-27 10:13:09 -08:00
silicons
e0c928a745 Update respawn.dm 2020-12-27 06:57:15 -07:00
silicons
67d9e79934 fix 2020-12-27 05:27:46 -08:00
silicons
d574996db9 Merge pull request #13846 from DeltaFire15/robot-antag-healing
Ling & Bloodsucker healing now affects IPCs / Synths
2020-12-27 05:48:48 -07:00
raspy-on-osu
367bcdc568 i think it's ready now (why did i put src. here) 2020-12-27 02:26:13 -05:00
raspy-on-osu
3738f09ca0 removes setup for ventcrawl implant in case of redundancy 2020-12-27 02:20:19 -05:00
raspy-on-osu
c8831b622e fixes abductor ventcrawl gland to no longer have a duration 2020-12-27 01:13:35 -05:00
silicons
753c1389cc fix 2020-12-26 22:04:05 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08:00
silicons
46b58fa5ba file ops 2020-12-26 21:10:12 -08:00
silicons
bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons
dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons
952d744378 done 2020-12-26 20:31:31 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -08:00
silicons
fb2b4f05c1 Merge branch 'subtler_tables' of github.com-kevinz000:silicons/Citadel-Station-13 into subtler_tables 2020-12-26 18:43:09 -08:00
silicons
36125c609d ily putnam 2020-12-26 18:41:31 -08:00
timothyteakettle
fcd8d35c76 thank 2020-12-27 02:23:57 +00:00
silicons
97be4a5d12 Update say_vr.dm 2020-12-26 17:34:31 -07:00
silicons
b885abb69d okay 2020-12-26 16:28:10 -08:00
silicons
27ecbdd6f1 why did i do this 2020-12-26 16:22:14 -08:00
Lin
b0b483105a Merge pull request #13857 from silicons/contractor_fix_for_real
fixes contractor pods this time for real (and 25% tested instead of 0%)
2020-12-26 23:52:51 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
DeltaFire
9b165220a6 Merge pull request #13879 from Citadel-Station-13/silicons-patch-45
admin varedit now bypasses toxlover because accidentally killing people is not okay
2020-12-26 19:48:24 +01:00
silicons
92b2177316 Update _job.dm 2020-12-26 11:35:09 -07:00
silicons
017db3de90 Update topic.dm 2020-12-26 11:05:18 -07:00
silicons
646db6ef32 Update rust_lore.dm 2020-12-26 11:03:51 -07:00
silicons
f5ecdad8e9 Update eldritch_antag.dm 2020-12-26 10:58:46 -07:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00