Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-03-08 10:37:10 +01:00
committed by GitHub
115 changed files with 996 additions and 1021 deletions
+1 -2
View File
@@ -171,9 +171,8 @@
if(istype(W))
if(istype(W, /obj/item/clothing))
var/obj/item/clothing/C = W
if(C.rig_restrict_helmet)
if(C.hardsuit_restrict_helmet)
to_chat(src, "<span class='warning'>You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)</span>")// Stop eva helms equipping.
else
equip_to_slot_if_possible(C, slot)
else