This commit is contained in:
Kashargul
2024-11-15 19:48:26 +01:00
parent 28333a1195
commit d0b9872e70
+10 -10
View File
@@ -66,11 +66,11 @@ var/list/ventcrawl_machinery = list(
/mob/living/proc/is_allowed_vent_crawl_item(var/obj/carried_item)
//Ability master easy test for allowed (cheaper than istype)
if(carried_item == ability_master)
return 1
return TRUE
if(isanimal(src))
var/mob/living/simple_mob/S = src
if(carried_item == S.myid) //VOREStation Edit
return 1 //VOREStation Edit
if(carried_item == S.myid)
return TRUE
//Try to find it in our allowed list (istype includes subtypes)
var/listed = FALSE
for(var/test_type in can_enter_vent_with)
@@ -80,23 +80,23 @@ var/list/ventcrawl_machinery = list(
//Only allow it if it's "IN" the mob, not equipped on/being held. //Disabled, as it's very annoying that, for example, Pun Pun has no way to ventcrawl with his suit if given the verb, since the list of allowed items is ignored for worn items.
if(listed/* && !get_inventory_slot(carried_item)*/)
return 1
return TRUE
/mob/living/carbon/is_allowed_vent_crawl_item(var/obj/item/carried_item)
if(carried_item in internal_organs)
return 1
return TRUE
return ..()
/mob/living/carbon/human/is_allowed_vent_crawl_item(var/obj/item/carried_item)
if(carried_item in organs)
return 1
return TRUE
if(species.name == SPECIES_REPLICANT_CREW)
if(istype(carried_item, /obj/item/clothing/under))
return 1 //Allow them to not vent crawl naked
return TRUE //Allow them to not vent crawl naked
if(istype(carried_item, /obj/item))
var/obj/item/I = carried_item
if(I.w_class <= 2)
return 1 //Allow them to carry items that fit in pockets
if(I.w_class <= ITEMSIZE_SMALL)
return TRUE //Allow them to carry items that fit in pockets
return ..()
/mob/living/proc/ventcrawl_carry()
@@ -129,7 +129,7 @@ var/list/ventcrawl_machinery = list(
return pipe
/mob/living/carbon/alien/ventcrawl_carry()
return 1
return TRUE
/mob/living/var/ventcrawl_layer = 3