cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2023-10-04 15:37:41 -07:00
committed by GitHub
parent 00a5f09ad4
commit d2e66e6410
310 changed files with 1035 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/xenobio2/machinery/core_extractor.dm
View File

@@ -26,11 +26,11 @@
/obj/machinery/slime/extractor/attackby(var/obj/item/W, var/mob/user)
//Let's try to deconstruct first.
if(W.is_screwdriver() && !inuse)
if(W.has_tool_quality(TOOL_SCREWDRIVER) && !inuse)
default_deconstruction_screwdriver(user, W)
return
if(W.is_crowbar())
if(W.has_tool_quality(TOOL_CROWBAR))
default_deconstruction_crowbar(user, W)
return

4
code/modules/xenobio2/machinery/injector.dm
View File

@@ -88,11 +88,11 @@
/obj/machinery/xenobio2/manualinjector/attackby(var/obj/item/W, var/mob/user)
//Let's try to deconstruct first.
if(W.is_screwdriver())
if(W.has_tool_quality(TOOL_SCREWDRIVER))
default_deconstruction_screwdriver(user, W)
return
if(W.is_crowbar() && !occupant)
if(W.has_tool_quality(TOOL_CROWBAR) && !occupant)
default_deconstruction_crowbar(user, W)
return

4
code/modules/xenobio2/machinery/slime_replicator.dm
View File

@@ -24,11 +24,11 @@
/obj/machinery/slime/replicator/attackby(var/obj/item/W, var/mob/user)
//Let's try to deconstruct first.
if(W.is_screwdriver() && !inuse)
if(W.has_tool_quality(TOOL_SCREWDRIVER) && !inuse)
default_deconstruction_screwdriver(user, W)
return
if(W.is_crowbar())
if(W.has_tool_quality(TOOL_CROWBAR))
default_deconstruction_crowbar(user, W)
return