From 46e4023ba9b9f70d56390d988637c614e01ff02a Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Sun, 4 Aug 2019 05:07:24 +0100 Subject: [PATCH] Monkey business --- code/_onclick/hud/screen_objects.dm | 4 ++-- code/game/objects/items/tanks/tanks.dm | 2 +- code/modules/mob/living/carbon/human/inventory.dm | 6 ------ code/modules/mob/living/carbon/inventory.dm | 6 ++++++ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 00ec766ea5..75349c5789 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -278,9 +278,9 @@ screen_loc = ui_internal /obj/screen/internals/Click() - if(!ishuman(usr)) + if(!iscarbon(usr)) return - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/C = usr if(C.incapacitated()) return diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 3cc5249b56..0ddca78c95 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -23,7 +23,7 @@ toggle_internals(user) /obj/item/tank/proc/toggle_internals(mob/user) - var/mob/living/carbon/human/H = user + var/mob/living/carbon/H = user if(!istype(H)) return diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 3dd4807251..d35df6b789 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -77,12 +77,6 @@ s_store, ) -/mob/living/carbon/human/proc/get_internal_slots() - return list( - head, - wear_mask, - ) - //This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible() /mob/living/carbon/human/equip_to_slot(obj/item/I, slot) if(!..()) //a check failed or the item has already found its slot diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index bc2d6132e1..2c4627b0ee 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -140,3 +140,9 @@ /mob/living/carbon/proc/get_holding_bodypart_of_item(obj/item/I) var/index = get_held_index_of_item(I) return index && hand_bodyparts[index] + +/mob/living/carbon/proc/get_internal_slots() + return list( + head, + wear_mask, + )