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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Monkey business

Browse Source
This commit is contained in:
Chayse Ramsay
2019-08-04 05:07:24 +01:00
parent a0a21dc01f
commit 46e4023ba9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_onclick/hud/screen_objects.dm
View File

@@ -278,9 +278,9 @@
screen_loc = ui_internal screen_loc = ui_internal
/obj/screen/internals/Click() /obj/screen/internals/Click()
if(!ishuman(usr)) if(!iscarbon(usr))
return return
var/mob/living/carbon/human/C = usr var/mob/living/carbon/C = usr
if(C.incapacitated()) if(C.incapacitated())
return return

2
code/game/objects/items/tanks/tanks.dm
View File

@@ -23,7 +23,7 @@
toggle_internals(user) toggle_internals(user)
/obj/item/tank/proc/toggle_internals(mob/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)) if(!istype(H))
return return

6
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -77,12 +77,6 @@
s_store, 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() //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) /mob/living/carbon/human/equip_to_slot(obj/item/I, slot)
if(!..()) //a check failed or the item has already found its slot if(!..()) //a check failed or the item has already found its slot

6
code/modules/mob/living/carbon/inventory.dm
View File

@@ -140,3 +140,9 @@
/mob/living/carbon/proc/get_holding_bodypart_of_item(obj/item/I) /mob/living/carbon/proc/get_holding_bodypart_of_item(obj/item/I)
var/index = get_held_index_of_item(I) var/index = get_held_index_of_item(I)
return index && hand_bodyparts[index] return index && hand_bodyparts[index]
/mob/living/carbon/proc/get_internal_slots()
return list(
head,
wear_mask,
)