Commit Graph

18273 Commits

Author SHA1 Message Date
kappa-sama 1aee5e880a god 2020-01-11 12:24:23 -05:00
kevinz000 af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Ghom 34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
Ghom 7fa3289013 Merge pull request #10497 from Trilbyspaceclone/uplink_redo
Cleans up uplink_items into each folder
2020-01-11 15:28:04 +01:00
Ghom 894abc67c0 Merge pull request #10502 from Linzolle/big-boss
[s] i'm trying to sneak around
2020-01-11 15:24:21 +01:00
Ghom c2b3e7b0ec Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2020-01-11 15:21:08 +01:00
Ghom 1f9a7066f0 Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7
Grey Tide spear is now vareditable
2020-01-11 15:10:16 +01:00
Ghom 3a72d1f434 Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
allow guests to use looc
2020-01-11 15:09:37 +01:00
Ghom e12f5e9e44 Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15
Fixes health analyzers
2020-01-11 15:07:55 +01:00
Ghom e851939281 Merge pull request #10523 from Hatterhat/fuck-you-baltimore
you can finally put armor plating on your standard explorer suit hood again
2020-01-11 15:06:20 +01:00
Ghom 5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
2020-01-11 15:03:45 +01:00
Putnam 85f6367df5 weh 2020-01-11 03:50:19 -08:00
Putnam 9d3873f26f traitor always available 2020-01-11 03:32:14 -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
Hatterhat 2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06: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
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
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 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 8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
Ghommie c9375a1288 Fixes reagent containers examination. 2020-01-10 14:19:22 +01:00
Letter N 315756d95a banjo 2020-01-10 19:39:57 +08:00
Letter N 6ec3fde836 better-signalers 2020-01-10 18:06:55 +08:00