mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
- Changed all "male" and "female" assignments to use the constants MALE and FEMALE.
- Added a message_admins() message which is sent if a character setup mismatch is detected to help diagnose the problem. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4496 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -97,7 +97,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
|
|||||||
usr.say(invocation)
|
usr.say(invocation)
|
||||||
else
|
else
|
||||||
usr.say(dd_replacetext(invocation," ","`"))
|
usr.say(dd_replacetext(invocation," ","`"))
|
||||||
if(usr.gender=="male")
|
if(usr.gender==MALE)
|
||||||
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
||||||
else
|
else
|
||||||
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
switch(invocation_type)
|
switch(invocation_type)
|
||||||
if("shout")
|
if("shout")
|
||||||
usr.say("[invocation] [uppertext(chosenarea.name)]")
|
usr.say("[invocation] [uppertext(chosenarea.name)]")
|
||||||
if(usr.gender=="male")
|
if(usr.gender==MALE)
|
||||||
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
||||||
else
|
else
|
||||||
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
var/ckey = null
|
var/ckey = null
|
||||||
var/realName = null
|
var/realName = null
|
||||||
var/datum/mind/mind = null
|
var/datum/mind/mind = null
|
||||||
gender = "male"
|
gender = MALE
|
||||||
|
|
||||||
/obj/item/seeds/grapeseed
|
/obj/item/seeds/grapeseed
|
||||||
name = "pack of grape seeds"
|
name = "pack of grape seeds"
|
||||||
|
|||||||
@@ -360,9 +360,9 @@
|
|||||||
/proc/NukeNameAssign(var/lastname,var/list/syndicates)
|
/proc/NukeNameAssign(var/lastname,var/list/syndicates)
|
||||||
for(var/datum/mind/synd_mind in syndicates)
|
for(var/datum/mind/synd_mind in syndicates)
|
||||||
switch(synd_mind.current.gender)
|
switch(synd_mind.current.gender)
|
||||||
if("male")
|
if(MALE)
|
||||||
synd_mind.name = "[pick(first_names_male)] [lastname]"
|
synd_mind.name = "[pick(first_names_male)] [lastname]"
|
||||||
if("female")
|
if(FEMALE)
|
||||||
synd_mind.name = "[pick(first_names_female)] [lastname]"
|
synd_mind.name = "[pick(first_names_female)] [lastname]"
|
||||||
synd_mind.current.real_name = synd_mind.name
|
synd_mind.current.real_name = synd_mind.name
|
||||||
return
|
return
|
||||||
@@ -906,7 +906,9 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
|||||||
|
|
||||||
// -- End mode specific stuff
|
// -- End mode specific stuff
|
||||||
|
|
||||||
podman.gender = gender
|
podman.gender = ghost.gender
|
||||||
|
if(podman.gender in list(NEUTER, PLURAL)) //Sanity check, which should never actually happen.
|
||||||
|
podman.gender = pick(MALE,FEMALE)
|
||||||
|
|
||||||
if(!podman.dna)
|
if(!podman.dna)
|
||||||
podman.dna = new /datum/dna()
|
podman.dna = new /datum/dna()
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
dat += "<TT>Connection severed.</TT><BR>"
|
dat += "<TT>Connection severed.</TT><BR>"
|
||||||
else
|
else
|
||||||
var/honorific = "Mr."
|
var/honorific = "Mr."
|
||||||
if(user.gender == "female")
|
if(user.gender == FEMALE)
|
||||||
honorific = "Ms."
|
honorific = "Ms."
|
||||||
dat += "<font color=red><i>Identity not found in operative database. What can the Syndicate do for you today, [honorific] [user.name]?</i></font><br>"
|
dat += "<font color=red><i>Identity not found in operative database. What can the Syndicate do for you today, [honorific] [user.name]?</i></font><br>"
|
||||||
if(!selfdestructing)
|
if(!selfdestructing)
|
||||||
|
|||||||
@@ -103,9 +103,9 @@
|
|||||||
|
|
||||||
if(ELECTRICHANDS in M.augmentations)
|
if(ELECTRICHANDS in M.augmentations)
|
||||||
var/gendertxt = "their"
|
var/gendertxt = "their"
|
||||||
if(M.gender == "male")
|
if(M.gender == MALE)
|
||||||
gendertxt = "his"
|
gendertxt = "his"
|
||||||
if(M.gender == "female")
|
if(M.gender == FEMALE)
|
||||||
gendertxt = "her"
|
gendertxt = "her"
|
||||||
|
|
||||||
visible_message("\red <B>[M] has shocked [src] with [gendertxt] bare hands!</B>")
|
visible_message("\red <B>[M] has shocked [src] with [gendertxt] bare hands!</B>")
|
||||||
|
|||||||
@@ -468,9 +468,9 @@
|
|||||||
else
|
else
|
||||||
if(ELECTRICHANDS in M.augmentations)
|
if(ELECTRICHANDS in M.augmentations)
|
||||||
var/gendertxt = "their"
|
var/gendertxt = "their"
|
||||||
if(M.gender == "male")
|
if(M.gender == MALE)
|
||||||
gendertxt = "his"
|
gendertxt = "his"
|
||||||
if(M.gender == "female")
|
if(M.gender == FEMALE)
|
||||||
gendertxt = "her"
|
gendertxt = "her"
|
||||||
|
|
||||||
visible_message("\red <B>[M] has shocked [src] with [gendertxt] bare hands!</B>")
|
visible_message("\red <B>[M] has shocked [src] with [gendertxt] bare hands!</B>")
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
dna.unique_enzymes = md5(name)
|
dna.unique_enzymes = md5(name)
|
||||||
//////////blah
|
//////////blah
|
||||||
var/gendervar
|
var/gendervar
|
||||||
if (gender == "male")
|
if (gender == MALE)
|
||||||
gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
|
gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
|
||||||
else
|
else
|
||||||
gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
|
gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
|
||||||
|
|||||||
@@ -254,7 +254,7 @@
|
|||||||
/mob/living/simple_animal/corgi/Ian
|
/mob/living/simple_animal/corgi/Ian
|
||||||
name = "Ian"
|
name = "Ian"
|
||||||
real_name = "Ian" //Intended to hold the name without altering it.
|
real_name = "Ian" //Intended to hold the name without altering it.
|
||||||
gender = "male"
|
gender = MALE
|
||||||
desc = "It's a corgi."
|
desc = "It's a corgi."
|
||||||
var/turns_since_scan = 0
|
var/turns_since_scan = 0
|
||||||
var/obj/movement_target
|
var/obj/movement_target
|
||||||
|
|||||||
@@ -729,6 +729,12 @@ datum/preferences
|
|||||||
if(character&&character.client)
|
if(character&&character.client)
|
||||||
setup_client(character.client)
|
setup_client(character.client)
|
||||||
|
|
||||||
|
//Debugging report to track down a bug, which randomly assigned the plural gender to people.
|
||||||
|
if(character.gender in list(PLURAL, NEUTER))
|
||||||
|
if(isliving(src)) //Ghosts get neuter by default
|
||||||
|
message_admins("[character] ([character.ckey]) has spawned with their gender as plural or neuter. Please notify coders.")
|
||||||
|
character.gender = MALE
|
||||||
|
|
||||||
proc/copy_to_observer(mob/dead/observer/character)
|
proc/copy_to_observer(mob/dead/observer/character)
|
||||||
spawn(10)
|
spawn(10)
|
||||||
if(character && character.client)
|
if(character && character.client)
|
||||||
|
|||||||
@@ -721,9 +721,9 @@
|
|||||||
M.primary = null
|
M.primary = null
|
||||||
var/t1 = hex2num(copytext(O.primary.uni_identity, 25, 28))
|
var/t1 = hex2num(copytext(O.primary.uni_identity, 25, 28))
|
||||||
if (t1 < 125)
|
if (t1 < 125)
|
||||||
O.gender = "male"
|
O.gender = MALE
|
||||||
else
|
else
|
||||||
O.gender = "female"
|
O.gender = FEMALE
|
||||||
M << "Genetic Transversal Complete!"
|
M << "Genetic Transversal Complete!"
|
||||||
if (M.client)
|
if (M.client)
|
||||||
M << "Transferring..."
|
M << "Transferring..."
|
||||||
@@ -792,11 +792,11 @@
|
|||||||
if (length(H.primary.uni_identity) >= 20)
|
if (length(H.primary.uni_identity) >= 20)
|
||||||
t1 = copytext(H.primary.uni_identity, 19, 21)
|
t1 = copytext(H.primary.uni_identity, 19, 21)
|
||||||
if (hex2num(t1) > 127)
|
if (hex2num(t1) > 127)
|
||||||
H.gender = "female"
|
H.gender = FEMALE
|
||||||
else
|
else
|
||||||
H.gender = "male"
|
H.gender = MALE
|
||||||
else
|
else
|
||||||
H.gender = "neuter"
|
H.gender = NEUTER
|
||||||
if (length(H.primary.uni_identity) >= 18)
|
if (length(H.primary.uni_identity) >= 18)
|
||||||
t1 = copytext(H.primary.uni_identity, 17, 19)
|
t1 = copytext(H.primary.uni_identity, 17, 19)
|
||||||
H.ns_tone = hex2num(t1)
|
H.ns_tone = hex2num(t1)
|
||||||
@@ -847,7 +847,7 @@
|
|||||||
var/i
|
var/i
|
||||||
while (!i)
|
while (!i)
|
||||||
var/randomname
|
var/randomname
|
||||||
if (src.gender == "male")
|
if (src.gender == MALE)
|
||||||
randomname = capitalize(pick(first_names_male) + " " + capitalize(pick(last_names)))
|
randomname = capitalize(pick(first_names_male) + " " + capitalize(pick(last_names)))
|
||||||
else
|
else
|
||||||
randomname = capitalize(pick(first_names_female) + " " + capitalize(pick(last_names)))
|
randomname = capitalize(pick(first_names_female) + " " + capitalize(pick(last_names)))
|
||||||
|
|||||||
Reference in New Issue
Block a user