diff --git a/GainStation13/icons/obj/scale.dmi b/GainStation13/icons/obj/scale.dmi index 596cfd2f..4df41e16 100644 Binary files a/GainStation13/icons/obj/scale.dmi and b/GainStation13/icons/obj/scale.dmi differ diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 786357dd..8355462c 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -3,7 +3,10 @@ name = "Podperson" id = "pod" default_color = "59CE00" - species_traits = list(MUTCOLORS,EYECOLOR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR,WINGCOLOR) + inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID + mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur", "deco_wings") + default_features = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "None", "snout" = "None", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "taur" = "None", "deco_wings" = "None") attack_verb = "slash" attack_sound = 'sound/weapons/slice.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' @@ -28,6 +31,10 @@ C.faction -= "plants" C.faction -= "vines" +/datum/species/pod/qualifies_for_rank(rank, list/features) + return TRUE + + /datum/species/pod/spec_life(mob/living/carbon/human/H) if(H.stat == DEAD) return @@ -68,6 +75,33 @@ if(/obj/item/projectile/energy/florayield) H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL) +/datum/species/pod/spec_death(gibbed, mob/living/carbon/human/H) + if(H) + stop_wagging_tail(H) + +/datum/species/pod/spec_stun(mob/living/carbon/human/H,amount) + if(H) + stop_wagging_tail(H) + . = ..() + +/datum/species/pod/can_wag_tail(mob/living/carbon/human/H) + return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts) + +/datum/species/pod/is_wagging_tail(mob/living/carbon/human/H) + return ("mam_waggingtail" in mutant_bodyparts) + +/datum/species/pod/start_wagging_tail(mob/living/carbon/human/H) + if("mam_tail" in mutant_bodyparts) + mutant_bodyparts -= "mam_tail" + mutant_bodyparts |= "mam_waggingtail" + H.update_body() + +/datum/species/pod/stop_wagging_tail(mob/living/carbon/human/H) + if("mam_waggingtail" in mutant_bodyparts) + mutant_bodyparts -= "mam_waggingtail" + mutant_bodyparts |= "mam_tail" + H.update_body() + /datum/species/pod/pseudo_weak id = "podweak" limbs_id = "pod" diff --git a/config/game_options.txt b/config/game_options.txt index e961ac22..25c70e8d 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -440,8 +440,8 @@ ROUNDSTART_RACES felinid #ROUNDSTART_RACES skeleton #ROUNDSTART_RACES zombie #ROUNDSTART_RACES slime -#ROUNDSTART_RACES pod -#ROUNDSTART_RACES military_synth +ROUNDSTART_RACES pod +ROUNDSTART_RACES military_synth #ROUNDSTART_RACES agent ## CITADEL Races diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index a9aa3667..724b8a95 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index b6214612..a5ca84a7 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ diff --git a/icons/obj/supplypods.dmi b/icons/obj/supplypods.dmi index 06e4f1e1..86603ff9 100644 Binary files a/icons/obj/supplypods.dmi and b/icons/obj/supplypods.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index cc015289..7fbf4889 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/icons/turf/walls/calorite_wall.dmi b/icons/turf/walls/calorite_wall.dmi new file mode 100644 index 00000000..f821308c Binary files /dev/null and b/icons/turf/walls/calorite_wall.dmi differ diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index c9034f09..dceeea0e 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -747,7 +747,7 @@ datum/sprite_accessory/ears/human/gret /datum/sprite_accessory/mam_snouts color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_snouts.dmi' - recommended_species = list("mammal", "slimeperson", "insect", "podweak", "avian", "aquatic") + recommended_species = list("mammal", "slimeperson", "insect", "podweak", "avian", "aquatic", "pod") /datum/sprite_accessory/mam_snouts/none name = "None" @@ -1825,7 +1825,7 @@ datum/sprite_accessory/mam_tails/insect dimension_x = 64 var/taur_mode = NOT_TAURIC color_src = MATRIXED - recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak", "avian", "aquatic") + recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak", "avian", "aquatic", "pod") /datum/sprite_accessory/taur/none name = "None"