Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251

[MIRROR] Nerfs peaceborg chain bucklestun
This commit is contained in:
LetterJay
2017-11-01 01:44:55 -04:00
committed by GitHub
2 changed files with 17 additions and 1 deletions

View File

@@ -561,6 +561,10 @@
if(istype(dampening_field))
QDEL_NULL(dampening_field)
dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))
var/mob/living/silicon/robot/owner = get_host()
if(owner)
owner.module.allow_riding = FALSE
/obj/item/borg/projectile_dampen/proc/deactivate_field()
QDEL_NULL(dampening_field)
@@ -568,6 +572,18 @@
for(var/P in tracked)
restore_projectile(P)
var/mob/living/silicon/robot/owner = get_host()
if(owner)
owner.module.allow_riding = TRUE
/obj/item/borg/projectile_dampen/proc/get_host()
if(istype(host))
return host
else
if(iscyborg(host.loc))
return host.loc
return null
/obj/item/borg/projectile_dampen/dropped()
. = ..()
host = loc