Commit Graph

21280 Commits

Author SHA1 Message Date
Putnam
85f6367df5 weh 2020-01-11 03:50:19 -08:00
Putnam
9d3873f26f traitor always available 2020-01-11 03:32:14 -08:00
Seris02
aaff36e9dc better now 2020-01-11 17:50:24 +08:00
Seris02
218c6bdc8f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade 2020-01-11 17:35:46 +08:00
Seris02
3ce8d2a61c adds bopwmanizing 2020-01-11 17:33:44 +08:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08:00
Putnam
e0587aeac0 another dumb patch 2020-01-10 23:33:26 -08:00
Seris02
11676f9e79 fixed again 2020-01-11 15:23:59 +08:00
Seris02
18d234178b fixed again 2020-01-11 14:40:02 +08:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
Hatterhat
b5f8e46941 this is blackmajors fault im not gonna lie 2020-01-10 23:41:30 -06:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Putnam
c6507d47e2 bad patches, ugh 2020-01-10 20:06:35 -08:00
kappa-sama
b6a187dc6d OOPS 2020-01-10 22:48:33 -05:00
kappa-sama
bfedc80c64 idk what this even is lmao 2020-01-10 22:39:45 -05:00
kappa-sama
3281db6000 scream 2020-01-10 22:39:13 -05:00
kappa-sama
5857da02a5 cheeki breeki 2020-01-10 22:35:30 -05:00
kappa-sama
93fc0b3716 xenos helmet 2020-01-10 22:34:26 -05:00
kappa-sama
799059071f this 2020-01-10 22:32:47 -05:00
kappa-sama
f88eefa8a9 stunsword 2020-01-10 22:30:28 -05:00
Seris02
29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
kappa-sama
e21cb4e67b shocking 2020-01-10 22:28:55 -05:00
kappa-sama
aacf4bec8b qm set 2020-01-10 22:26:48 -05:00
kappa-sama
62ebc2d226 zoom 2020-01-10 22:25:07 -05:00
Seris02
0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
kappa-sama
e5e58518e4 boomers 2020-01-10 22:22:44 -05:00
kappa-sama
412b0175b6 new file 2020-01-10 22:20:53 -05:00
kappa-sama
25422542c9 this 2020-01-10 22:19:00 -05:00
kappa-sama
2453e95eee moves this 2020-01-10 22:16:51 -05:00
BonniePandora
bb26f21c71 I have no idea what I'm doing to be quite honest 2020-01-11 02:43:58 +00:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin
42263a435a Merge pull request #10489 from Seris02/chameleonthing
Fixes and improvements for chameleon clothes
2020-01-11 01:12:43 +00:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
Lin
cd8e83e7c0 Merge pull request #10486 from Seris02/observe
moves observe to ghost tab instead of sticking it in the ooc tab
2020-01-10 23:56:46 +00:00
Lin
147d948ad8 Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13
reduces table cooldown to 0.4
2020-01-10 23:55:07 +00:00
kevinz000
b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
r4d6
96c75eb5ca Add a message when pulsing the open wire on airlocks 2020-01-10 17:01:46 -05:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
kevinz000
d4592449d2 Merge pull request #10484 from deathride58/topiccommandlimit
[s] Caches the status topic to prevent low-effort DDoSes
2020-01-10 14:00:43 -08:00
kevinz000
2c245a18fd compile 2020-01-10 13:43:53 -08:00
kevinz000
c0274b1bc6 compile 2020-01-10 13:28:56 -08:00
kevinz000
f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000
830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000
9cec806875 Update scanners.dm 2020-01-10 12:48:55 -08:00
kevinz000
7392760f38 Update scanners.dm 2020-01-10 12:48:19 -08:00
kevinz000
7ace9f0203 abstract types 2020-01-10 06:25:23 -08:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
kevinz000
a16a7a7fe0 subtypes 2020-01-10 06:12:03 -08:00