cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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

10
code/_helpers/unsorted.dm
View File

@@ -1074,7 +1074,7 @@ var/global/list/common_tools = list(
/proc/is_wire_tool(obj/item/I)
if(istype(I, /obj/item/device/multitool) || I.is_wirecutter())
if(istype(I, /obj/item/device/multitool) || I.has_tool_quality(TOOL_WIRECUTTER))
return TRUE
if(istype(I, /obj/item/device/assembly/signaler))
return TRUE
@@ -1088,6 +1088,12 @@ var/global/list/common_tools = list(
return 3800
else
return 0
if(/obj/item/weapon/tool/transforming)
var/obj/item/weapon/tool/transforming/TT = W
if(TT.possible_tooltypes[TT.current_tooltype] == TOOL_WELDER)
return 3800
else
return 0
if(/obj/item/weapon/flame/lighter)
if(W:lit)
return 1500
@@ -1135,7 +1141,7 @@ var/global/list/common_tools = list(
if(W.sharp)
return TRUE
return ( \
W.is_screwdriver() || \
W.has_tool_quality(TOOL_SCREWDRIVER) || \
istype(W, /obj/item/weapon/pen) || \
istype(W, /obj/item/weapon/weldingtool) || \
istype(W, /obj/item/weapon/flame/lighter/zippo) || \