cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces istypes with the proper tool_behaviour checks. (#40414)

Browse Source
This commit is contained in:
ShizCalev
2018-09-30 20:10:31 -04:00
committed by yogstation13-bot
parent 81a1280956
commit 5a29dc43e3
179 changed files with 489 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/components/remote_materials.dm
View File

@@ -74,7 +74,9 @@ handles linking back and forth.
_MakeLocal()
/datum/component/remote_materials/proc/OnAttackBy(datum/source, obj/item/I, mob/user)
if (istype(I, /obj/item/multitool))
if(I.tool_behaviour == TOOL_MULTITOOL)
if(!I.multitool_check_buffer(user, I))
return COMPONENT_NO_AFTERATTACK
var/obj/item/multitool/M = I
if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo))
if (silo == M.buffer)

2
code/datums/components/rotation.dm
View File

@@ -89,7 +89,7 @@
/datum/component/simple_rotation/proc/WrenchRot(datum/source, obj/item/I, mob/living/user)
if(!can_be_rotated.Invoke(user,default_rotation_direction) || !can_user_rotate.Invoke(user,default_rotation_direction))
return
if(istype(I,/obj/item/wrench))
if(I.tool_behaviour == TOOL_WRENCH)
BaseRot(user,default_rotation_direction)
return COMPONENT_NO_AFTERATTACK