Attack chain migration: structures. (#30365)

* Attack chain migration: structures.

* whoops

* wth
This commit is contained in:
warriorstar-orion
2025-09-14 19:21:36 +00:00
committed by GitHub
parent cd7b4e7292
commit 3208049a8a
87 changed files with 1396 additions and 404 deletions
@@ -139,11 +139,11 @@
var/ispipe = is_pipe()
var/nicetype = get_nice_name()
var/turf/T = get_turf(src)
if(T.intact)
to_chat(user, "<span class='warning'>You can only attach the [nicetype] if the floor plating is removed.</span>")
return
if(ispipe)
anchored = !anchored
level = anchored ? 1 : 2
@@ -184,7 +184,8 @@
nicetype = "sorting pipe"
return nicetype
/obj/structure/disposalconstruct/attackby__legacy__attackchain(obj/item/I, mob/user, params)
/obj/structure/disposalconstruct/item_interaction(mob/living/user, obj/item/I, list/modifiers)
. = ITEM_INTERACT_COMPLETE
var/nicetype = get_nice_name()
var/ispipe = is_pipe() // Indicates if we should change the level of this pipe
var/turf/T = get_turf(src)
+10 -9
View File
@@ -1043,11 +1043,11 @@
//attack by item
//weldingtool: unfasten and convert to obj/disposalconstruct
/obj/structure/disposalpipe/attackby__legacy__attackchain(obj/item/I, mob/user, params)
/obj/structure/disposalpipe/item_interaction(mob/living/user, obj/item/used, list/modifiers)
var/turf/T = get_turf(src)
if(T.intact || T.transparent_floor)
to_chat(user, "<span class='danger'>You can't interact with something that's under the floor!</span>")
return // prevent interaction with T-scanner revealed pipes and pipes under glass
return ITEM_INTERACT_COMPLETE // prevent interaction with T-scanner revealed pipes and pipes under glass
add_fingerprint(user)
@@ -1221,9 +1221,9 @@
if(mapping_fail)
stack_trace("[src] mapped incorrectly at [x],[y],[z] - [mapping_fail]")
/obj/structure/disposalpipe/sortjunction/attackby__legacy__attackchain(obj/item/I, mob/user, params)
/obj/structure/disposalpipe/sortjunction/item_interaction(mob/living/user, obj/item/I, list/modifiers)
if(..())
return
return ITEM_INTERACT_COMPLETE
if(istype(I, /obj/item/dest_tagger))
var/obj/item/dest_tagger/O = I
@@ -1244,6 +1244,7 @@
sort_type.Add(O.currTag)
to_chat(user, "<span class='notice'>Added [tag] to filter.</span>")
update_appearance(UPDATE_NAME|UPDATE_DESC)
return ITEM_INTERACT_COMPLETE
/obj/structure/disposalpipe/sortjunction/update_name()
. = ..()
@@ -1423,18 +1424,18 @@
linked = D
D.linkedtrunk = src
// Override attackby so we disallow trunkremoval when somethings ontop
/obj/structure/disposalpipe/trunk/attackby__legacy__attackchain(obj/item/I, mob/user, params)
/// Disallow trunkremoval when something's on top
/obj/structure/disposalpipe/trunk/item_interaction(mob/living/user, obj/item/I, list/modifiers)
//Disposal bins or chutes
//Disposal constructors
var/obj/structure/disposalconstruct/C = locate() in src.loc
if(C && C.anchored)
return
return ITEM_INTERACT_COMPLETE
var/turf/T = src.loc
if(T.intact || T.transparent_floor)
return // prevent interaction with T-scanner revealed pipes
// prevent interaction with T-scanner revealed pipes
return ITEM_INTERACT_COMPLETE
src.add_fingerprint(user)
// would transfer to next pipe segment, but we are in a trunk
+2 -1
View File
@@ -35,7 +35,8 @@
qdel(src)
/obj/structure/big_delivery/attackby__legacy__attackchain(obj/item/W as obj, mob/user as mob, params)
/obj/structure/big_delivery/item_interaction(mob/living/user, obj/item/W, list/modifiers)
. = ITEM_INTERACT_COMPLETE
if(istype(W, /obj/item/dest_tagger))
var/obj/item/dest_tagger/O = W