diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 978e2daca8d..40548020e13 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -86,7 +86,7 @@ #define BODYTYPE_CUSTOM (1<<6) // SKYRAT EDIT END -//Defines for Species IDs +// Defines for Species IDs. Used to refer to the name of a species, for things like bodypart names or species preferences. #define SPECIES_ABDUCTOR "abductor" #define SPECIES_ANDROID "android" #define SPECIES_DULLAHAN "dullahan" @@ -115,6 +115,11 @@ #define SPECIES_ZOMBIE_INFECTIOUS "memezombie" #define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie" +// Like species IDs, but not specifically attached a species. +#define BODYPART_TYPE_ALIEN "alien" +#define BODYPART_TYPE_ROBOTIC "robotic" +#define BODYPART_TYPE_DIGITIGRADE "digitigrade" + //See: datum/species/var/digitigrade_customization ///The species does not have digitigrade legs in generation. #define DIGITIGRADE_NEVER 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 4c4ae7e7c1e..862e4190390 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -218,6 +218,9 @@ Doesn't work on other aliens/AI.*/ /datum/action/cooldown/alien/acid/corrosion/PreActivate(atom/target) if(get_dist(owner, target) > 1) return FALSE + if(ismob(target)) //If it could corrode mobs, it would one-shot them. + owner.balloon_alert(owner, "doesn't work on mobs!") + return FALSE return ..() diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index fa3d62d8fb3..b7aa3dc1263 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -48,6 +48,7 @@ /obj/item/bodypart/chest/alien icon = 'icons/mob/animal_parts.dmi' icon_state = "alien_chest" + limb_id = BODYPART_TYPE_ALIEN dismemberable = 0 max_damage = 500 animal_origin = ALIEN_BODYPART @@ -156,6 +157,7 @@ /obj/item/bodypart/l_arm/alien icon = 'icons/mob/animal_parts.dmi' icon_state = "alien_l_arm" + limb_id = BODYPART_TYPE_ALIEN px_x = 0 px_y = 0 dismemberable = FALSE @@ -257,6 +259,7 @@ /obj/item/bodypart/r_arm/alien icon = 'icons/mob/animal_parts.dmi' icon_state = "alien_r_arm" + limb_id = BODYPART_TYPE_ALIEN px_x = 0 px_y = 0 dismemberable = FALSE @@ -349,6 +352,7 @@ /obj/item/bodypart/l_leg/alien icon = 'icons/mob/animal_parts.dmi' icon_state = "alien_l_leg" + limb_id = BODYPART_TYPE_ALIEN px_x = 0 px_y = 0 dismemberable = FALSE @@ -448,6 +452,7 @@ /obj/item/bodypart/r_leg/alien icon = 'icons/mob/animal_parts.dmi' icon_state = "alien_r_leg" + limb_id = BODYPART_TYPE_ALIEN px_x = 0 px_y = 0 dismemberable = FALSE diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm index a9fa1e4671a..3920fc6310d 100644 --- a/code/modules/surgery/bodyparts/robot_bodyparts.dm +++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm @@ -13,7 +13,7 @@ /obj/item/bodypart/l_arm/robot name = "cyborg left arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." - limb_id = "robotic" + limb_id = BODYPART_TYPE_ROBOTIC attack_verb_simple = list("slapped", "punched") inhand_icon_state = "buildpipe" icon = 'icons/mob/augmentation/augments.dmi' @@ -43,7 +43,7 @@ inhand_icon_state = "buildpipe" icon_static = 'icons/mob/augmentation/augments.dmi' icon = 'icons/mob/augmentation/augments.dmi' - limb_id = "robotic" + limb_id = BODYPART_TYPE_ROBOTIC flags_1 = CONDUCT_1 icon_state = "borg_r_arm" is_dimorphic = FALSE @@ -69,7 +69,7 @@ inhand_icon_state = "buildpipe" icon_static = 'icons/mob/augmentation/augments.dmi' icon = 'icons/mob/augmentation/augments.dmi' - limb_id = "robotic" + limb_id = BODYPART_TYPE_ROBOTIC flags_1 = CONDUCT_1 icon_state = "borg_l_leg" is_dimorphic = FALSE @@ -95,7 +95,7 @@ inhand_icon_state = "buildpipe" icon_static = 'icons/mob/augmentation/augments.dmi' icon = 'icons/mob/augmentation/augments.dmi' - limb_id = "robotic" + limb_id = BODYPART_TYPE_ROBOTIC flags_1 = CONDUCT_1 icon_state = "borg_r_leg" is_dimorphic = FALSE @@ -120,7 +120,7 @@ inhand_icon_state = "buildpipe" icon_static = 'icons/mob/augmentation/augments.dmi' icon = 'icons/mob/augmentation/augments.dmi' - limb_id = "robotic" + limb_id = BODYPART_TYPE_ROBOTIC flags_1 = CONDUCT_1 icon_state = "borg_chest" is_dimorphic = FALSE @@ -228,7 +228,7 @@ inhand_icon_state = "buildpipe" icon_static = 'icons/mob/augmentation/augments.dmi' icon = 'icons/mob/augmentation/augments.dmi' - limb_id = "robotic" + limb_id = BODYPART_TYPE_ROBOTIC flags_1 = CONDUCT_1 icon_state = "borg_head" is_dimorphic = FALSE diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm index ab531416760..63c3878285b 100644 --- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm @@ -34,7 +34,7 @@ /obj/item/bodypart/l_leg/digitigrade icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' uses_mutcolor = TRUE - limb_id = "digitigrade" + limb_id = BODYPART_TYPE_DIGITIGRADE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE /obj/item/bodypart/l_leg/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) @@ -53,15 +53,15 @@ shoes_compatible = TRUE if((uniform_compatible && suit_compatible && shoes_compatible) || (suit_compatible && shoes_compatible && human_owner.wear_suit?.flags_inv & HIDEJUMPSUIT)) //If the uniform is hidden, it doesnt matter if its compatible - limb_id = "digitigrade" + limb_id = BODYPART_TYPE_DIGITIGRADE else - limb_id = "lizard" + limb_id = SPECIES_LIZARD /obj/item/bodypart/r_leg/digitigrade icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi' uses_mutcolor = TRUE - limb_id = "digitigrade" + limb_id = BODYPART_TYPE_DIGITIGRADE bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE /obj/item/bodypart/r_leg/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) @@ -80,8 +80,7 @@ shoes_compatible = TRUE if((uniform_compatible && suit_compatible && shoes_compatible) || (suit_compatible && shoes_compatible && human_owner.wear_suit?.flags_inv & HIDEJUMPSUIT)) //If the uniform is hidden, it doesnt matter if its compatible - limb_id = "digitigrade" - + limb_id = BODYPART_TYPE_DIGITIGRADE else - limb_id = "lizard" + limb_id = SPECIES_LIZARD */ diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm index 0bd240e57c1..8bc0c7139ad 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm @@ -1,7 +1,7 @@ /datum/species/ghoul name = "Ghoul" id = SPECIES_GHOUL - examine_limb_id = "ghoul" + examine_limb_id = SPECIES_GHOUL say_mod = "rasps" species_traits = list(NOEYESPRITES, DYNCOLORS, HAS_FLESH, HAS_BONE, HAIR, FACEHAIR) can_have_genitals = FALSE //WHY WOULD YOU WANT TO FUCK ONE OF THESE THINGS?