Commit Graph

14466 Commits

Author SHA1 Message Date
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 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 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
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
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
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
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
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08: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
kevinz000 b6e14c6b86 compile 2020-01-10 14:30:20 -08: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 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 8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
kevinz000 24c1baddd0 compile compile compile 2020-01-10 05:50:19 -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
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
Trilbyspaceclone d463ba8edd Update others.dm 2020-01-09 20:43:31 -05:00
Trilbyspaceclone 7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin 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
Lin ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498
Improves the set_APTFT verb into a proc.
2020-01-10 00:38:06 +00:00
Hatterhat 04aa0eda5a tg 40046, 41695, 46726 - hope i didnt forget smth 2020-01-09 18:35:13 -06:00
Unknown e008388176 Bee models 2020-01-09 16:13:23 -07:00
Trilbyspaceclone 05d86b7072 Update uplink_items.dm 2020-01-09 16:03:27 -05:00
Trilbyspaceclone 9ba5f35398 Update uplink_items.dm 2020-01-09 16:02:53 -05:00
TrilbySpaceClone 74d881388e so much cleaner 2020-01-09 15:42:09 -05:00
DeltaFire 9361fe6d8e 😂
Vitaly matrixes weren't actually succing slimes.. nice.
2020-01-09 21:03:09 +01:00
r4d6 581654f13f Add RPD to research 2020-01-09 13:55:31 -05:00