Merge pull request #2311 from Citadel-Station-13/upstream-merge-29775

[MIRROR] Fixes repairing jumpsuits.
This commit is contained in:
LetterJay
2017-08-09 02:22:17 -05:00
committed by GitHub
+5 -7
View File
@@ -538,13 +538,15 @@ BLIND // can't see anything
if(accessory_overlay)
. += accessory_overlay
/obj/item/clothing/under/attackby(obj/item/W, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
C.use(1)
has_sensor = HAS_SENSORS
to_chat(user,"<span class='notice'>You repair the suit sensors on [src] with [C].</span>")
return 1
if(!attach_accessory(I, user))
return ..()
/obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE)
..()
@@ -591,10 +593,6 @@ BLIND // can't see anything
..()
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if(!attach_accessory(I, user))
..()
/obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1)
. = FALSE
if(istype(I, /obj/item/clothing/accessory))