cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Experimentor deconstruction, and standardizes into tool procs (#17593)

Browse Source 
* Update experimentor.dm

* Should have been sane

* Forgot that
This commit is contained in:
Vi3trice
2022-04-12 15:52:01 +01:00
committed by GitHub
parent 93666752f1
commit 620a8d49a4
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/experimentor.dm
+16 -12
View File
@@ -115,19 +115,9 @@
if(shocked)
shock(user,50)
if(default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", O))
if(linked_console)
linked_console.linked_destroy = null
linked_console = null
return
if(exchange_parts(user, O))
return
if(panel_open && istype(O, /obj/item/crowbar))
default_deconstruction_crowbar(user, O)
return
if(!checkCircumstances(O))
to_chat(user, "<span class='warning'>[O] is not yet valid for [src] and must be completed!</span>")
return
@@ -157,9 +147,23 @@
return
/obj/machinery/r_n_d/experimentor/default_deconstruction_crowbar(user, obj/item/O)
/obj/machinery/r_n_d/experimentor/crowbar_act(mob/user, obj/item/I)
if(!panel_open)
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
ejectItem()
..(O)
default_deconstruction_crowbar(user, I)
/obj/machinery/r_n_d/experimentor/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", I)
if(linked_console)
linked_console.linked_destroy = null
linked_console = null
/obj/machinery/r_n_d/experimentor/attack_hand(mob/user)
user.set_machine(src)