mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
1# This is a combination of 2 commits. (#32276)
can no longer turn on projectile dampener with buckled mobs
This commit is contained in:
@@ -546,9 +546,11 @@
|
||||
to_chat(user, "<span class='boldwarning'>[src] is still recycling its projectors!</span>")
|
||||
return
|
||||
cycle_delay = world.time + PKBORG_DAMPEN_CYCLE_DELAY
|
||||
active = !active
|
||||
if(active)
|
||||
activate_field(user)
|
||||
if(!active)
|
||||
if(!user.has_buckled_mobs())
|
||||
activate_field()
|
||||
else
|
||||
to_chat(user, "<span class='warning'>[src]'s safety cutoff prevents you from activating it due to living beings being ontop of you!</span>")
|
||||
else
|
||||
deactivate_field()
|
||||
update_icon()
|
||||
@@ -561,16 +563,17 @@
|
||||
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
|
||||
active = TRUE
|
||||
|
||||
/obj/item/borg/projectile_dampen/proc/deactivate_field()
|
||||
QDEL_NULL(dampening_field)
|
||||
visible_message("<span class='warning'>\The [src] shuts off!</span>")
|
||||
for(var/P in tracked)
|
||||
restore_projectile(P)
|
||||
active = FALSE
|
||||
|
||||
var/mob/living/silicon/robot/owner = get_host()
|
||||
if(owner)
|
||||
|
||||
Reference in New Issue
Block a user