Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447

2019-12-23 04:32:09 +01:00
parent 284202a092 e39f9732e0
commit b75349bebf
541 changed files with 13581 additions and 3235 deletions
@@ -309,4 +309,4 @@
 //The "pocket" for the M1 helmet so you can tuck things into the elastic band

 /datum/component/storage/concrete/pockets/tiny/spacenam
-	attack_hand_interact = TRUE		//So you can actually see what you stuff in there
+	attack_hand_interact = TRUE		//So you can actually see what you stuff in there