mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-11 10:22:13 +00:00
Nerfs peaceborg chain bucklestun (#32251)
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
This commit is contained in:
committed by
CitadelStationBot
parent
31e2303e39
commit
d792624dd8
@@ -561,6 +561,10 @@
|
|||||||
if(istype(dampening_field))
|
if(istype(dampening_field))
|
||||||
QDEL_NULL(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))
|
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()
|
/obj/item/borg/projectile_dampen/proc/deactivate_field()
|
||||||
QDEL_NULL(dampening_field)
|
QDEL_NULL(dampening_field)
|
||||||
@@ -568,6 +572,18 @@
|
|||||||
for(var/P in tracked)
|
for(var/P in tracked)
|
||||||
restore_projectile(P)
|
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()
|
/obj/item/borg/projectile_dampen/dropped()
|
||||||
. = ..()
|
. = ..()
|
||||||
host = loc
|
host = loc
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
if(R.has_buckled_mobs())
|
if(R.has_buckled_mobs())
|
||||||
for(var/mob/living/L in R.buckled_mobs)
|
for(var/mob/living/L in R.buckled_mobs)
|
||||||
L.visible_message("<span class='warning'>[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!</span>") //I know it's bad.
|
L.visible_message("<span class='warning'>[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!</span>") //I know it's bad.
|
||||||
L.Knockdown(60)
|
L.Knockdown(10)
|
||||||
R.unbuckle_mob(L)
|
R.unbuckle_mob(L)
|
||||||
do_sparks(5, 0, L)
|
do_sparks(5, 0, L)
|
||||||
..()
|
..()
|
||||||
|
|||||||
Reference in New Issue
Block a user