mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 07:27:57 +01:00
Smith machines now drop their contained components on destroy (#30462)
* Smith machines now drop their contained components on destroy * Update casting_basin.dm
This commit is contained in:
@@ -94,6 +94,16 @@
|
||||
. = ..()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
/obj/machinery/smithing/casting_basin/Destroy()
|
||||
if(cast)
|
||||
cast.forceMove(src.loc)
|
||||
if(produced_item)
|
||||
produced_item.forceMove(src.loc)
|
||||
if(linked_crucible)
|
||||
linked_crucible.linked_machines -= src
|
||||
linked_crucible = null
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/smithing/casting_basin/multitool_act(mob/living/user, obj/item/I)
|
||||
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
|
||||
return
|
||||
@@ -274,9 +284,3 @@
|
||||
// Clean up temps
|
||||
qdel(temp_product)
|
||||
return FINISH_ATTACK
|
||||
|
||||
/obj/machinery/smithing/casting_basin/Destroy()
|
||||
if(linked_crucible)
|
||||
linked_crucible.linked_machines -= src
|
||||
linked_crucible = null
|
||||
return ..()
|
||||
|
||||
@@ -38,6 +38,15 @@
|
||||
batched_item_types = typecacheof(batched_item_types)
|
||||
RefreshParts()
|
||||
|
||||
/obj/machinery/smithing/kinetic_assembler/Destroy()
|
||||
if(primary)
|
||||
primary.forceMove(src.loc)
|
||||
if(secondary)
|
||||
secondary.forceMove(src.loc)
|
||||
if(trim)
|
||||
trim.forceMove(src.loc)
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/smithing/kinetic_assembler/examine(mob/user)
|
||||
. = ..()
|
||||
if(primary || secondary || trim)
|
||||
|
||||
@@ -40,6 +40,11 @@
|
||||
operating = FALSE
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/machinery/smithing/Destroy()
|
||||
if(working_component)
|
||||
working_component.forceMove(src.loc)
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/smithing/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/grab))
|
||||
var/obj/item/grab/G = used
|
||||
|
||||
Reference in New Issue
Block a user