From a7dd74201cf024393eee86c3b9d7fae51b250984 Mon Sep 17 00:00:00 2001 From: raspy-on-osu Date: Thu, 4 Feb 2021 16:51:06 -0500 Subject: [PATCH] 2 --- code/modules/mob/living/carbon/alien/alien.dm | 6 +++++- code/modules/mob/living/carbon/alien/humanoid/humanoid.dm | 2 ++ code/modules/mob/living/carbon/alien/humanoid/queen.dm | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 455d96362d..f5970d9da2 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -11,6 +11,10 @@ bubble_icon = "alien" type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno + /// Whether they can ventcrawl; this is set individually for 'humanoid' and 'royal' types + /// 'royal' types (Praetorian, Queen) cannot ventcrawl + var/can_ventcrawl + /// How much brute damage without armor piercing they do against mobs in melee var/meleeSlashHumanPower = 20 /// How much power they have for DefaultCombatKnockdown when attacking humans @@ -38,7 +42,7 @@ create_internal_organs() - if(!(name == "alien queen")) + if(can_ventcrawl) AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) . = ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index d0addbab21..0d2a1c0c59 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -20,6 +20,8 @@ bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien, /obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien) + can_ventcrawl = TRUE + //This is fine right now, if we're adding organ specific damage this needs to be updated /mob/living/carbon/alien/humanoid/Initialize() diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 42b62e37a0..bcc83f14f9 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -9,6 +9,7 @@ layer = LARGE_MOB_LAYER //above most mobs, but below speechbubbles pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper. butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3) + can_ventcrawl = FALSE meleeKnockdownPower = 125 meleeSlashHumanPower = 30