Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

This commit is contained in:
Poojawa
2019-06-03 05:35:52 -05:00
215 changed files with 4105 additions and 2416 deletions
+2 -2
View File
@@ -24,11 +24,11 @@
ToggleHood()
/obj/item/clothing/suit/hooded/item_action_slot_check(slot, mob/user)
if(slot == SLOT_WEAR_SUIT)
if(slot == SLOT_WEAR_SUIT || slot == SLOT_NECK)
return 1
/obj/item/clothing/suit/hooded/equipped(mob/user, slot)
if(slot != SLOT_WEAR_SUIT)
if(slot != SLOT_WEAR_SUIT && slot != SLOT_NECK)
RemoveHood()
..()