Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roundstart Podpeople! (and oozeling/jelly changes) #343

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
23 changes: 23 additions & 0 deletions code/modules/mob/living/carbon/human/species_types/podpeople.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified icons/mob/species/human/human_face.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
inherent_traits = list(
TRAIT_TOXINLOVER,
TRAIT_NOFIRE,
TRAIT_RESISTHEATHANDS,
//TRAIT_ALWAYS_CLEAN,
TRAIT_EASYDISMEMBER,
TRAIT_NOBLOOD,
)

hair_color = "mutcolor"
Expand Down Expand Up @@ -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. \
Expand Down Expand Up @@ -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",
Expand Down
Binary file added sound/voice/oozeling/Ooze_Laugh_1.ogg
Binary file not shown.
Binary file added sound/voice/oozeling/Ooze_Laugh_2.ogg
Binary file not shown.
Binary file added sound/voice/oozeling/Ooze_Laugh_3.ogg
Binary file not shown.
Binary file added sound/voice/oozeling/Ooze_Scream_1.ogg
Binary file not shown.
Binary file added sound/voice/oozeling/Ooze_Scream_2.ogg
Binary file not shown.