diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 968c4dce145a..843666a5d7dc 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -608,6 +608,10 @@ name = "Ponytail 7" icon_state = "hair_ponytail7" +/datum/sprite_accessory/hair/ponytailalchemist + name = "Ponytail (Alchemist)" + icon_state = "hair_alchemist" + /datum/sprite_accessory/hair/highponytail name = "Ponytail (High)" icon_state = "hair_highponytail" @@ -1046,6 +1050,10 @@ name = "Moustache (Hulk Hogan)" icon_state = "facial_hogan" //-Neek +/datum/sprite_accessory/facial_hair/robotnik + name = "Moustache (Robotnik)" + icon_state = "facial_robotnik" + /datum/sprite_accessory/facial_hair/selleck name = "Moustache (Selleck)" icon_state = "facial_selleck" diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 8378976261fa..19183dabb505 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -17,6 +17,7 @@ inherent_traits = list( TRAIT_TOXINLOVER, TRAIT_NOBLOOD, + TRAIT_RESISTHEAT, ) mutanttongue = /obj/item/organ/internal/tongue/jelly mutantlungs = /obj/item/organ/internal/lungs/slime @@ -29,7 +30,7 @@ liked_food = MEAT | BUGS toxic_food = NONE coldmod = 6 // = 3x cold damage - heatmod = 0.5 // = 1/4x heat damage + //heatmod = 0.5 // = 1/4x heat damage burnmod = 0.5 // = 1/2x generic burn damage payday_modifier = 0.75 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT 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 2690c18927e2..528af8c5c264 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -79,3 +79,26 @@ /datum/species/pod/randomize_features(mob/living/carbon/human_mob) randomize_external_organs(human_mob) + +/datum/species/pod/get_species_description() + return "A species of genetically engineered plant people." + +/datum/species/pod/create_pref_unique_perks() + var/list/to_add = list() + + to_add += list( + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "sun", + SPECIES_PERK_NAME = "Photosynthesis", + SPECIES_PERK_DESC = "[plural_form] feed off of light around them.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "user-plus", + SPECIES_PERK_NAME = "Green Thumbs", + SPECIES_PERK_DESC = "[plural_form] can handle dangerous plants with ease", + ), + ) + + return to_add diff --git a/icons/mob/species/human/human_face.dmi b/icons/mob/species/human/human_face.dmi index ab6c4ad22f2f..cff73f7c6950 100644 Binary files a/icons/mob/species/human/human_face.dmi and b/icons/mob/species/human/human_face.dmi differ diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm index ba6cfcff9ff4..7eaa2cecdac9 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm @@ -12,9 +12,9 @@ inherent_traits = list( TRAIT_TOXINLOVER, TRAIT_NOFIRE, + TRAIT_RESISTHEATHANDS, //TRAIT_ALWAYS_CLEAN, TRAIT_EASYDISMEMBER, - TRAIT_NOBLOOD, ) hair_color = "mutcolor" @@ -43,30 +43,16 @@ ) /datum/species/oozeling/get_scream_sound(mob/living/carbon/human/human) - if(human.gender == MALE) - if(prob(1)) - return 'sound/voice/human/wilhelm_scream.ogg' - return pick( - 'sound/voice/human/malescream_1.ogg', - 'sound/voice/human/malescream_2.ogg', - 'sound/voice/human/malescream_3.ogg', - 'sound/voice/human/malescream_4.ogg', - 'sound/voice/human/malescream_5.ogg', - 'sound/voice/human/malescream_6.ogg', - ) - return pick( - 'sound/voice/human/femalescream_1.ogg', - 'sound/voice/human/femalescream_2.ogg', - 'sound/voice/human/femalescream_3.ogg', - 'sound/voice/human/femalescream_4.ogg', - 'sound/voice/human/femalescream_5.ogg', + 'sound/voice/oozeling/Ooze_Scream_1.ogg', + 'sound/voice/oozeling/Ooze_Scream_2.ogg', ) /datum/species/oozeling/get_laugh_sound(mob/living/carbon/human/human) - if(human.gender == MALE) - return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg') - else - return 'sound/voice/human/womanlaugh.ogg' + return pick( + 'sound/voice/oozeling/Ooze_Laugh_1.ogg', + 'sound/voice/oozeling/Ooze_Laugh_2.ogg', + 'sound/voice/oozeling/Ooze_Laugh_3.ogg', + ) /datum/species/oozeling/get_species_description() return "A species of sentient semi-solids. \ @@ -241,15 +227,9 @@ list( SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, SPECIES_PERK_ICON = "burn", - SPECIES_PERK_NAME = "incombustible", + SPECIES_PERK_NAME = "Incombustible", SPECIES_PERK_DESC = "[plural_form] cannot be set aflame.", ), - list( - SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, - SPECIES_PERK_ICON = "tint", - SPECIES_PERK_NAME = initial(exotic_blood.name), - SPECIES_PERK_DESC = "[name] blood is [initial(exotic_blood.name)], which can make recieving medical treatment harder.", - ), list( SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, SPECIES_PERK_ICON = "wind", diff --git a/sound/voice/oozeling/Ooze_Laugh_1.ogg b/sound/voice/oozeling/Ooze_Laugh_1.ogg new file mode 100644 index 000000000000..342501b8711d Binary files /dev/null and b/sound/voice/oozeling/Ooze_Laugh_1.ogg differ diff --git a/sound/voice/oozeling/Ooze_Laugh_2.ogg b/sound/voice/oozeling/Ooze_Laugh_2.ogg new file mode 100644 index 000000000000..782d328cce35 Binary files /dev/null and b/sound/voice/oozeling/Ooze_Laugh_2.ogg differ diff --git a/sound/voice/oozeling/Ooze_Laugh_3.ogg b/sound/voice/oozeling/Ooze_Laugh_3.ogg new file mode 100644 index 000000000000..87c0da2fba67 Binary files /dev/null and b/sound/voice/oozeling/Ooze_Laugh_3.ogg differ diff --git a/sound/voice/oozeling/Ooze_Scream_1.ogg b/sound/voice/oozeling/Ooze_Scream_1.ogg new file mode 100644 index 000000000000..a84915e76bc0 Binary files /dev/null and b/sound/voice/oozeling/Ooze_Scream_1.ogg differ diff --git a/sound/voice/oozeling/Ooze_Scream_2.ogg b/sound/voice/oozeling/Ooze_Scream_2.ogg new file mode 100644 index 000000000000..97937b0dc6e4 Binary files /dev/null and b/sound/voice/oozeling/Ooze_Scream_2.ogg differ