cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12663 from Very-Soft/ventcrawls

Browse Source 
Allow mobs to ventcrawl with their mobid
This commit is contained in:
Casey
2022-04-05 22:14:52 -04:00
committed by CHOMPStation2
parent 0dd44e94bf
commit a3d4539391
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/silicon/robot/drone/drone.dm
View File

@@ -40,7 +40,8 @@ var/list/mob_hat_cache = list()
can_pull_size = ITEMSIZE_NO_CONTAINER can_pull_size = ITEMSIZE_NO_CONTAINER
can_pull_mobs = MOB_PULL_SMALLER can_pull_mobs = MOB_PULL_SMALLER
can_enter_vent_with = list( can_enter_vent_with = list(
/obj) /obj,
/atom/movable/emissive_blocker)
mob_bump_flag = SIMPLE_ANIMAL mob_bump_flag = SIMPLE_ANIMAL
mob_swap_flags = SIMPLE_ANIMAL mob_swap_flags = SIMPLE_ANIMAL

3
code/modules/mob/living/silicon/robot/drone/swarm.dm
View File

@@ -23,7 +23,8 @@
can_pull_size = ITEMSIZE_NO_CONTAINER can_pull_size = ITEMSIZE_NO_CONTAINER
can_pull_mobs = MOB_PULL_SMALLER can_pull_mobs = MOB_PULL_SMALLER
can_enter_vent_with = list( can_enter_vent_with = list(
/obj) /obj,
/atom/movable/emissive_blocker)
mob_always_swap = 1 mob_always_swap = 1

5
code/modules/ventcrawl/ventcrawl.dm
View File

@@ -57,7 +57,10 @@ var/list/ventcrawl_machinery = list(
//Ability master easy test for allowed (cheaper than istype) //Ability master easy test for allowed (cheaper than istype)
if(carried_item == ability_master) if(carried_item == ability_master)
return 1 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) //Try to find it in our allowed list (istype includes subtypes)
var/listed = FALSE var/listed = FALSE
for(var/test_type in can_enter_vent_with) for(var/test_type in can_enter_vent_with)