cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640

Browse Source 
[MIRROR] Adds a multitool_act and a proper check on tool_check
This commit is contained in:
LetterJay
2017-11-13 11:46:41 -06:00
committed by GitHub
parent 0a21e6e83b 2106e136e0
commit a21a5cf30d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/__DEFINES/tools.dm
View File

@@ -1,5 +1,6 @@
#define TOOL_NONE 0 #define TOOL_NONE 0
#define TOOL_CROWBAR 1 #define TOOL_CROWBAR 1
#define TOOL_SCREWDRIVER 2 #define TOOL_MULTITOOL 2
#define TOOL_WIRECUTTER 3 #define TOOL_SCREWDRIVER 3
#define TOOL_WRENCH 4 #define TOOL_WIRECUTTER 4
#define TOOL_WRENCH 5

2
code/_onclick/item_attack.dm
View File

@@ -14,6 +14,8 @@
return FALSE return FALSE
if(TOOL_CROWBAR) if(TOOL_CROWBAR)
return target.crowbar_act(user, src) return target.crowbar_act(user, src)
if(TOOL_MULTITOOL)
return target.multitool_act(user, src)
if(TOOL_SCREWDRIVER) if(TOOL_SCREWDRIVER)
return target.screwdriver_act(user, src) return target.screwdriver_act(user, src)
if(TOOL_WRENCH) if(TOOL_WRENCH)

3
code/game/atoms.dm
View File

@@ -626,6 +626,9 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
/atom/proc/crowbar_act(mob/user, obj/item/tool) /atom/proc/crowbar_act(mob/user, obj/item/tool)
return return
/atom/proc/multitool_act(mob/user, obj/item/tool)
return
/atom/proc/screwdriver_act(mob/user, obj/item/tool) /atom/proc/screwdriver_act(mob/user, obj/item/tool)
return return