Merge pull request #13547 from KorPhaeron/reactive_fixes

Armor fixes (Reactive Teleport Armor and reflector vest name)
This commit is contained in:
tkdrg
2015-12-16 04:00:20 -03:00
+8 -8
View File
@@ -100,7 +100,7 @@
put_on_delay = 50
/obj/item/clothing/suit/armor/laserproof
name = "ablative armor vest"
name = "reflector vest"
desc = "A vest that excels in protecting the wearer against energy projectiles, as well as occasionally reflecting them."
icon_state = "armor_reflec"
item_state = "armor_reflec"
@@ -172,13 +172,13 @@
continue
turfs += T
if(!turfs.len)
turfs += pick(/turf in orange(6, src))
var/turf/picked = pick(turfs)
if(!isturf(picked))
return
if(H.buckled)
H.buckled.unbuckle_mob()
H.forceMove(picked)
turfs += pick(/turf in orange(6, H))
var/turf/picked = pick(turfs)
if(!isturf(picked))
return
if(H.buckled)
H.buckled.unbuckle_mob()
H.forceMove(picked)
return 1
return 0