cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1620

Browse Source
This commit is contained in:
SinTwo
2016-08-15 10:45:13 -04:00
parent cba8cdcde8
commit ae0fbd52c2
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mob/living/carbon/human/appearance.dm
View File

@@ -27,6 +27,13 @@
update_dna() update_dna()
return 1 return 1
/mob/living/carbon/human/proc/change_gender_identity(var/identifying_gender)
if(src.identifying_gender == identifying_gender)
return
src.identifying_gender = identifying_gender
return 1
/mob/living/carbon/human/proc/change_hair(var/hair_style) /mob/living/carbon/human/proc/change_hair(var/hair_style)
if(!hair_style) if(!hair_style)
return return

5
code/modules/mob/living/carbon/human/species/species_shapeshift.dm
View File

@@ -130,8 +130,13 @@ var/list/wrapped_species_by_ref = list()
if(!new_gender) if(!new_gender)
return return
var/new_gender_identity = input("Please select a gender Identity.", "Shapeshifter Gender Identity") as null|anything in list(FEMALE, MALE, NEUTER, PLURAL)
if(!new_gender_identity)
return
visible_message("<span class='notice'>\The [src]'s form contorts subtly.</span>") visible_message("<span class='notice'>\The [src]'s form contorts subtly.</span>")
change_gender(new_gender) change_gender(new_gender)
change_gender_identity(new_gender_identity)
/mob/living/carbon/human/proc/shapeshifter_select_shape() /mob/living/carbon/human/proc/shapeshifter_select_shape()

28
code/modules/mob/living/carbon/human/species/station/prometheans.dm
View File

@@ -97,17 +97,25 @@ var/datum/species/shapeshifter/promethean/prometheans
else else
H.equip_to_slot_or_del(L, slot_in_backpack) H.equip_to_slot_or_del(L, slot_in_backpack)
/datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H,var/mob/living/target) /datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H, var/mob/living/target)
var/t_him = "them" var/t_him = "them"
switch(target.gender) if(ishuman(target))
if(MALE) var/mob/living/carbon/human/T = target
t_him = "him" switch(T.identifying_gender)
if(FEMALE) if(MALE)
t_him = "her" t_him = "him"
if(FEMALE)
t_him = "her"
else
switch(target.gender)
if(MALE)
t_him = "him"
if(FEMALE)
t_him = "her"
H.visible_message("<span class='notice'>\The [H] glomps [target] to make [t_him] feel better!</span>", \ H.visible_message("<span class='notice'>\The [H] glomps [target] to make [t_him] feel better!</span>", \
"<span class='notice'>You glomps [target] to make [t_him] feel better!</span>") "<span class='notice'>You glomp [target] to make [t_him] feel better!</span>")
H.apply_stored_shock_to(target) H.apply_stored_shock_to(target)
/datum/species/shapeshifter/promethean/handle_death(var/mob/living/carbon/human/H) /datum/species/shapeshifter/promethean/handle_death(var/mob/living/carbon/human/H)
@@ -171,11 +179,11 @@ var/datum/species/shapeshifter/promethean/prometheans
return return
var/t_she = "She is" var/t_she = "She is"
if(H.gender == MALE) if(H.identifying_gender == MALE)
t_she = "He is" t_she = "He is"
else if(H.gender == PLURAL) else if(H.identifying_gender == PLURAL)
t_she = "They are" t_she = "They are"
else if(H.gender == NEUTER) else if(H.identifying_gender == NEUTER)
t_she = "It is" t_she = "It is"
switch(stored_shock_by_ref["\ref[H]"]) switch(stored_shock_by_ref["\ref[H]"])