From a3d4539391821322ba8ddcde0a5679b0cd107c5c Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 5 Apr 2022 22:14:52 -0400 Subject: [PATCH] Merge pull request #12663 from Very-Soft/ventcrawls Allow mobs to ventcrawl with their mobid --- code/modules/mob/living/silicon/robot/drone/drone.dm | 3 ++- code/modules/mob/living/silicon/robot/drone/swarm.dm | 3 ++- code/modules/ventcrawl/ventcrawl.dm | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index c374f68d1d..e8b5f9541c 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -40,7 +40,8 @@ var/list/mob_hat_cache = list() can_pull_size = ITEMSIZE_NO_CONTAINER can_pull_mobs = MOB_PULL_SMALLER can_enter_vent_with = list( - /obj) + /obj, + /atom/movable/emissive_blocker) mob_bump_flag = SIMPLE_ANIMAL mob_swap_flags = SIMPLE_ANIMAL diff --git a/code/modules/mob/living/silicon/robot/drone/swarm.dm b/code/modules/mob/living/silicon/robot/drone/swarm.dm index 153594801c..17056e29dd 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm.dm @@ -23,7 +23,8 @@ can_pull_size = ITEMSIZE_NO_CONTAINER can_pull_mobs = MOB_PULL_SMALLER can_enter_vent_with = list( - /obj) + /obj, + /atom/movable/emissive_blocker) mob_always_swap = 1 diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index a1fd6af591..fffb96ff47 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -57,7 +57,10 @@ var/list/ventcrawl_machinery = list( //Ability master easy test for allowed (cheaper than istype) if(carried_item == ability_master) return 1 - + if(isanimal(src)) + var/mob/living/simple_mob/S + if(carried_item == S.mobcard) //VOREStation Edit + return 1 //VOREStation Edit //Try to find it in our allowed list (istype includes subtypes) var/listed = FALSE for(var/test_type in can_enter_vent_with)