Commit Graph
18387 Commits
Author SHA1 Message Date
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-samaandGitHub b6a187dc6d OOPS 2020-01-10 22:48:33 -05:00
kappa-samaandGitHub bfedc80c64 idk what this even is lmao 2020-01-10 22:39:45 -05:00
kappa-samaandGitHub 3281db6000 scream 2020-01-10 22:39:13 -05:00
kappa-samaandGitHub 5857da02a5 cheeki breeki 2020-01-10 22:35:30 -05:00
kappa-samaandGitHub 93fc0b3716 xenos helmet 2020-01-10 22:34:26 -05:00
kappa-samaandGitHub 799059071f this 2020-01-10 22:32:47 -05:00
kappa-samaandGitHub 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-samaandGitHub e21cb4e67b shocking 2020-01-10 22:28:55 -05:00
kappa-samaandGitHub aacf4bec8b qm set 2020-01-10 22:26:48 -05:00
kappa-samaandGitHub 62ebc2d226 zoom 2020-01-10 22:25:07 -05:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
kappa-samaandGitHub e5e58518e4 boomers 2020-01-10 22:22:44 -05:00
kappa-samaandGitHub 412b0175b6 new file 2020-01-10 22:20:53 -05:00
kappa-samaandGitHub 25422542c9 this 2020-01-10 22:19:00 -05:00
kappa-samaandGitHub 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
LinandGitHub 42263a435a Merge pull request #10489 from Seris02/chameleonthing
Fixes and improvements for chameleon clothes
2020-01-11 01:12:43 +00:00
LinandGitHub fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
LinandGitHub 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
LinandGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 9cec806875 Update scanners.dm 2020-01-10 12:48:55 -08:00
kevinz000andGitHub 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
Putnam c0be46e07f balancing/sanity checks 2020-01-10 04:23:43 -08: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
Putnam e468fa3e71 Added a binary version and fixed up sprites 2020-01-10 01:26:09 -08:00
Linzolle dc0fdebc21 hrmngh colonel 2020-01-09 22:46:43 -06:00
Linzolle 8d70181ecf uh oh stinky 2020-01-09 22:41:50 -06:00
Putnam 36a6daa26f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-09 19:09:38 -08:00
Putnam bdda3f940c it works 2020-01-09 18:55:56 -08:00
rosko e1f524fc03 ports fast augmentation pr from /tg/
https://github.com/tgstation/tgstation/pull/47721
2020-01-10 03:53:27 +02:00
TrilbyspacecloneandGitHub d463ba8edd Update others.dm 2020-01-09 20:43:31 -05:00
TrilbyspacecloneandGitHub 3c877c96f5 Update sheet_types.dm 2020-01-09 20:42:56 -05:00
TrilbyspacecloneandGitHub 530d710f57 Update mineral.dm 2020-01-09 20:42:07 -05:00
TrilbyspacecloneandGitHub 7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
LinandGitHub e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
LinandGitHub c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Hatterhat 102e973737 considering these are basic nodes 2020-01-09 18:39:31 -06:00