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 02:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proc to define

Browse Source
This commit is contained in:
Chayse Ramsay
2019-08-04 05:48:08 +01:00
parent 46e4023ba9
commit f9d829b111
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__DEFINES/inventory.dm
View File

@@ -230,3 +230,6 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(
/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman, /obj/item/tank/internals/plasmaman,
/obj/item/toy))) /obj/item/toy)))
//Internals checker
#define GET_INTERNAL_SLOTS(C) list(C.head, C.wear_mask)

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

@@ -293,7 +293,7 @@
var/obj/item/clothing/check var/obj/item/clothing/check
var/internals = FALSE var/internals = FALSE
for(check in C.get_internal_slots()) for(check in GET_INTERNAL_SLOTS(C))
if(istype(check, /obj/item/clothing/mask)) if(istype(check, /obj/item/clothing/mask))
var/obj/item/clothing/mask/M = check var/obj/item/clothing/mask/M = check
if(M.mask_adjusted) if(M.mask_adjusted)

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

@@ -36,7 +36,7 @@
var/obj/item/clothing/check var/obj/item/clothing/check
var/internals = FALSE var/internals = FALSE
for(check in H.get_internal_slots()) for(check in GET_INTERNAL_SLOTS(H))
if(istype(check, /obj/item/clothing/mask)) if(istype(check, /obj/item/clothing/mask))
var/obj/item/clothing/mask/M = check var/obj/item/clothing/mask/M = check
if(M.mask_adjusted) if(M.mask_adjusted)

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

@@ -140,9 +140,3 @@
/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,
)

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

@@ -306,12 +306,8 @@
/mob/living/carbon/proc/get_breath_from_internal(volume_needed) /mob/living/carbon/proc/get_breath_from_internal(volume_needed)
var/obj/item/clothing/check var/obj/item/clothing/check
var/internals = FALSE var/internals = FALSE
var/internalslots = list(
head,
wear_mask,
)
for(check in internalslots) for(check in GET_INTERNAL_SLOTS(src))
if(CHECK_BITFIELD(check.clothing_flags, ALLOWINTERNALS)) if(CHECK_BITFIELD(check.clothing_flags, ALLOWINTERNALS))
internals = TRUE internals = TRUE
if(internal) if(internal)