Commit Graph

11757 Commits

Author SHA1 Message Date
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
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
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
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
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
Ghommie
c9375a1288 Fixes reagent containers examination. 2020-01-10 14:19:22 +01: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
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
Unknown
753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
kevinz000
dfce4ea75f Update looc.dm 2020-01-09 09:30:49 -08:00
TrilbySpaceClone
34c6288d22 so fantastic! 2020-01-09 05:46:30 -05:00
Seris02
3f7a0f4b7c fixes chameleon cloak icon 2020-01-09 15:07:43 +08:00
Seris02
adfb077a0a chameleon fixes 2020-01-09 15:05:46 +08:00
Unknown
62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
loginsandylogout
709a803f19 oops 2020-01-08 23:34:43 -06:00
loginsandylogout
02541f1e3e thisis it 2020-01-08 23:34:26 -06:00
loginsandylogout
725828b996 fixes ti? 2020-01-08 22:52:47 -06:00
loginsandylogout
248785dc94 aaa 2020-01-08 22:45:23 -06:00
loginsandylogout
20948b66bb should hide legs 2020-01-08 22:45:23 -06:00
Commandersand
11aab54864 oops 2020-01-08 22:45:23 -06:00
Commandersand
c2a8c23751 fixes 2020-01-08 22:45:22 -06:00
Unknown
8a8d0bf6da Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:36:22 -07:00
Unknown
afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
Seris02
c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08:00
Ghom
dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00