mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 05:27:01 +01:00
Attack chain migration: structures. (#30365)
* Attack chain migration: structures. * whoops * wth
This commit is contained in:
@@ -109,8 +109,9 @@
|
||||
move_speed_multiplier = 0.5 // You can move at run speed while in this box.
|
||||
material_drop = null
|
||||
|
||||
/obj/structure/closet/cardboard/agent/attackby__legacy__attackchain(obj/item/I, mob/living/user)
|
||||
return
|
||||
/obj/structure/closet/cardboard/agent/Initialize(mapload)
|
||||
. = ..()
|
||||
RegisterSignal(src, COMSIG_ATTACK_BY, TYPE_PROC_REF(/datum, signal_cancel_attack_by))
|
||||
|
||||
/obj/structure/closet/cardboard/agent/open()
|
||||
. = ..()
|
||||
|
||||
@@ -27,20 +27,20 @@
|
||||
close_sound_volume = 15
|
||||
var/item_path = /obj/item/bodybag
|
||||
|
||||
/obj/structure/closet/body_bag/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
/obj/structure/closet/body_bag/item_interaction(mob/living/user, obj/item/I, list/modifiers)
|
||||
if(is_pen(I))
|
||||
var/t = rename_interactive(user, I)
|
||||
if(isnull(t))
|
||||
return
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
cut_overlays()
|
||||
if(t)
|
||||
add_overlay("bodybag_label")
|
||||
return
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
if(istype(I, /obj/item/wirecutters))
|
||||
to_chat(user, "<span class='notice'>You cut the tag off the bodybag.</span>")
|
||||
name = initial(name)
|
||||
cut_overlays()
|
||||
return
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
return ..()
|
||||
|
||||
/obj/structure/closet/body_bag/welder_act(mob/user, obj/item/I)
|
||||
|
||||
@@ -65,7 +65,6 @@
|
||||
icon_state = "floor_sign"
|
||||
/// What does the sign say?
|
||||
var/label = ""
|
||||
new_attack_chain = TRUE
|
||||
|
||||
/obj/structure/custom_sign/New(turf/loc, new_label)
|
||||
. = ..()
|
||||
|
||||
@@ -67,21 +67,21 @@
|
||||
density = TRUE
|
||||
pass_flags_self = LETPASSTHROW | PASSTAKE
|
||||
|
||||
/obj/structure/holohoop/attackby__legacy__attackchain(obj/item/W, mob/user, params)
|
||||
/obj/structure/holohoop/item_interaction(mob/living/user, obj/item/W, list/modifiers)
|
||||
if(istype(W, /obj/item/grab) && get_dist(src, user) <= 1)
|
||||
var/obj/item/grab/G = W
|
||||
if(G.state < GRAB_AGGRESSIVE)
|
||||
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
|
||||
return
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
G.affecting.forceMove(loc)
|
||||
G.affecting.Weaken(10 SECONDS)
|
||||
visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into [src]!</span>")
|
||||
qdel(W)
|
||||
return
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
else if(isitem(W) && get_dist(src,user) <= 1)
|
||||
user.drop_item(src)
|
||||
visible_message("<span class='notice'>[user] dunks [W] into [src]!</span>")
|
||||
return
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
/obj/structure/holohoop/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
|
||||
if(isitem(AM) && !isprojectile(AM))
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
// into the box.
|
||||
if(istype(user.pulling, /obj/structure/ore_box))
|
||||
var/obj/structure/ore_box/box = user.pulling
|
||||
box.attackby__legacy__attackchain(src, user)
|
||||
box.item_interaction(user, src)
|
||||
|
||||
/obj/item/storage/bag/ore/cyborg
|
||||
name = "cyborg mining satchel"
|
||||
|
||||
Reference in New Issue
Block a user