[MIRROR] _machinery.dm hotfix (#8345)

* _machinery.dm hotfix (#61618)

messed up a couple of places where the parent wasn't being called (deconstruct proc) or the proc wouldn't return the value at the end (attack_robot and check_nap_violation procs), this should fix those

* _machinery.dm hotfix

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-09-24 17:46:41 +01:00
committed by GitHub
co-authored by Ghilker
parent fe91d6981a
commit c5b4b83020
+6 -2
View File
@@ -567,6 +567,7 @@
var/datum/bank_account/department_account = SSeconomy.get_dep_account(payment_department)
if(department_account)
department_account.adjust_money(fair_market_price)
return TRUE
/obj/machinery/proc/nap_violation(mob/violator)
return
@@ -630,6 +631,8 @@
if(user_unbuckle_mob(unbuckled,user))
return TRUE
return _try_interact(user)
/obj/machinery/attack_ai(mob/user)
if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !isAdminGhostAI(user))
return FALSE
@@ -688,15 +691,16 @@
/obj/machinery/deconstruct(disassembled = TRUE)
if(flags_1 & NODECONSTRUCT_1)
return..()
return ..() //Just delete us, no need to call anything else.
on_deconstruction()
if(!LAZYLEN(component_parts))
return
return ..() //we don't have any parts.
spawn_frame(disassembled)
for(var/obj/item/part in component_parts)
part.forceMove(loc)
LAZYCLEARLIST(component_parts)
return ..()
/**
* Spawns a frame where this machine is. If the machine was not disassmbled, the