From 6ec39e1f51829816c9bddc533287f809d2529c9b Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 15 Jul 2015 19:00:54 +0100 Subject: [PATCH 1/4] Fixes 'plural' gender and fixes some instances of not using the t_* variables Todo: fully rework this to not need lots of t_* variables, they're annoying and kinda crappy. Maybe a gender datum; /datum/gender/male/var/he = "he" or something. --- .../mob/living/carbon/human/examine.dm | 71 +++++++++++-------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 007f5a3552..9c08e7a88d 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -25,32 +25,45 @@ skipface |= wear_mask.flags_inv & HIDEFACE // crappy hacks because you can't do \his[src] etc. I'm sorry this proc is so unreadable, blame the text macros :< - var/t_He = "It" //capitalised for use at the start of each line. - var/t_his = "its" - var/t_him = "it" - var/t_has = "has" - var/t_is = "is" + var/t_He = "They" //capitalised for use at the start of each line. + var/t_he = "they" + var/t_his = "their" + var/t_him = "them" + var/t_has = "have" + var/t_is = "are" + var/t_does = "do" var/msg = "*---------*\nThis is " - if( skipjumpsuit && skipface ) //big suits/masks/helmets make it hard to tell their gender - t_He = "They" - t_his = "their" - t_him = "them" - t_has = "have" - t_is = "are" - else + //big suits/masks/helmets make it hard to tell their gender + if(!skipjumpsuit || !skipface) if(icon) msg += "\icon[icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated switch(gender) if(MALE) t_He = "He" + t_he = "he" t_his = "his" t_him = "him" + t_has = "has" + t_is = "is" + t_does = "does" if(FEMALE) t_He = "She" + t_he = "she" t_his = "her" t_him = "her" + t_has = "has" + t_is = "is" + t_does = "does" + if(NEUTER) + t_He = "It" + t_he = "it" + t_his = "its" + t_him = "it" + t_has = "has" + t_is = "is" + t_does = "does" msg += "[src.name]" if(species.name != "Human") @@ -214,15 +227,15 @@ if (src.stat) msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n" if((stat == 2 || src.losebreath) && distance <= 3) - msg += "[t_He] does not appear to be breathing.\n" + msg += "[t_He] [t_does] not appear to be breathing.\n" if(istype(usr, /mob/living/carbon/human) && !usr.stat && Adjacent(usr)) usr.visible_message("[usr] checks [src]'s pulse.", "You check [src]'s pulse.") spawn(15) if(distance <= 1 && usr.stat != 1) if(pulse == PULSE_NONE) - usr << "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]..." + usr << "[t_He] [t_has] no pulse[src.client ? "" : " and [t_his] soul has departed"]..." else - usr << "[t_He] has a pulse!" + usr << "[t_He] [t_has] a pulse!" if(fire_stacks) msg += "[t_He] [t_is] covered in some liquid.\n" if(on_fire) @@ -244,7 +257,7 @@ if((!species.has_organ["brain"] || has_brain()) && stat != DEAD) if(!key) - msg += "[t_He] [t_is] fast asleep. It doesn't look like they are waking up anytime soon.\n" + msg += "[t_He] [t_is] fast asleep. It doesn't look like [t_he] [t_is] waking up anytime soon.\n" else if(!client) msg += "[t_He] [t_has] suddenly fallen asleep.\n" @@ -255,15 +268,15 @@ if(temp) if(temp.status & ORGAN_DESTROYED) is_destroyed["[temp.display_name]"] = 1 - wound_flavor_text["[temp.display_name]"] = "[t_He] is missing [t_his] [temp.display_name].\n" + wound_flavor_text["[temp.display_name]"] = "[t_He] [t_is] missing [t_his] [temp.display_name].\n" continue if(temp.status & ORGAN_ROBOT) if(!(temp.brute_dam + temp.burn_dam)) if(!species.flags & IS_SYNTHETIC) - wound_flavor_text["[temp.display_name]"] = "[t_He] has a robot [temp.display_name]!\n" + wound_flavor_text["[temp.display_name]"] = "[t_He] [t_has] a robot [temp.display_name]!\n" continue else - wound_flavor_text["[temp.display_name]"] = "[t_He] has a robot [temp.display_name]. It has" + wound_flavor_text["[temp.display_name]"] = "[t_He] [t_has] a robot [temp.display_name]. It has" if(temp.brute_dam) switch(temp.brute_dam) if(0 to 20) wound_flavor_text["[temp.display_name]"] += " some dents" @@ -300,22 +313,22 @@ switch(wound_descriptors[wound]) if(1) if(!flavor_text.len) - flavor_text += "[t_He] has[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a [wound]" + flavor_text += "[t_He] [t_has][prob(10) && !(wound in no_exclude) ? " what might be" : ""] a [wound]" else flavor_text += "[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a [wound]" if(2) if(!flavor_text.len) - flavor_text += "[t_He] has[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s" + flavor_text += "[t_He] [t_has][prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s" else flavor_text += "[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s" if(3 to 5) if(!flavor_text.len) - flavor_text += "[t_He] has several [wound]s" + flavor_text += "[t_He] [t_has] several [wound]s" else flavor_text += " several [wound]s" if(6 to INFINITY) if(!flavor_text.len) - flavor_text += "[t_He] has a bunch of [wound]s" + flavor_text += "[t_He] [t_has] a bunch of [wound]s" else flavor_text += " a ton of [wound]\s" var/flavor_text_string = "" @@ -342,7 +355,7 @@ if(wound_flavor_text["head"] && (is_destroyed["head"] || (!skipmask && !(wear_mask && istype(wear_mask, /obj/item/clothing/mask/gas))))) msg += wound_flavor_text["head"] else if(is_bleeding["head"]) - msg += "[src] has blood running down [t_his] face!\n" + msg += "[src] [t_has] blood running down [t_his] face!\n" if(wound_flavor_text["chest"] && !w_uniform && !skipjumpsuit) //No need. A missing chest gibs you. msg += wound_flavor_text["chest"] else if(is_bleeding["chest"]) @@ -384,14 +397,14 @@ else if(is_bleeding["right foot"]) display_shoes = 1 if(display_chest) - msg += "[src] has blood soaking through from under [t_his] clothing!\n" + msg += "[src] [t_has] blood soaking through from under [t_his] clothing!\n" if(display_shoes) - msg += "[src] has blood running from [t_his] shoes!\n" + msg += "[src] [t_has] blood running from [t_his] shoes!\n" if(display_gloves) - msg += "[src] has blood running from under [t_his] gloves!\n" + msg += "[src] [t_has] blood running from under [t_his] gloves!\n" for(var/implant in get_visible_implants(0)) - msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" + msg += "[src] [t_has] \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" @@ -448,7 +461,7 @@ if (pose) if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 ) pose = addtext(pose,".") //Makes sure all emotes end with a period. - msg += "\n[t_He] is [pose]" + msg += "\n[t_He] [t_is] [pose]" user << msg From bcd81af4f6bc50661aeada2639b68387ef628bf3 Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Thu, 16 Jul 2015 10:52:26 -0400 Subject: [PATCH 2/4] Bandaid fix for sealed rig removal --- code/modules/mob/living/carbon/human/inventory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 35cb9840cb..c7940cd7ab 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -772,7 +772,7 @@ It can still be worn/put on as normal. if(slot_to_process) if(strip_item) //Stripping an item from the mob var/obj/item/W = strip_item - target.remove_from_mob(W) + target.unEquip(W) W.add_fingerprint(source) if(slot_to_process == slot_l_store) //pockets! Needs to process the other one too. Snowflake code, wooo! It's not like anyone will rewrite this anytime soon. If I'm wrong then... CONGRATULATIONS! ;) if(target.r_store) From 4aa11441ccf7e5c38306e469e6948cc9c0ac0765 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Thu, 16 Jul 2015 20:32:56 +0200 Subject: [PATCH 3/4] Fixes #10212. NSV Icarus is now NDV Icarus. --- code/controllers/shuttle_controller.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 5fb5f0c8bd..259fb956ba 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -203,7 +203,7 @@ var/global/datum/shuttle_controller/shuttle_controller "Mining asteroid" = locate(/area/vox_station/mining) ) - VS.announcer = "NSV Icarus" + VS.announcer = "NDV Icarus" VS.arrival_message = "Attention, Exodus, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not." VS.departure_message = "Your guests are pulling away, Exodus - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip." VS.interim = locate(/area/vox_station/transit) @@ -227,7 +227,7 @@ var/global/datum/shuttle_controller/shuttle_controller "Arrivals dock" = locate(/area/syndicate_station/arrivals_dock), ) - MS.announcer = "NSV Icarus" + MS.announcer = "NDV Icarus" MS.arrival_message = "Attention, Exodus, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors." MS.departure_message = "Your visitors are on their way out of the system, Exodus, burning delta-v like it's nothing. Good riddance." MS.interim = locate(/area/syndicate_station/transit) From d1a05d9fd610af83ee9ef5950a0a08640d150341 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Fri, 17 Jul 2015 23:11:42 +0200 Subject: [PATCH 4/4] Compilation fixes. --- code/modules/mob/living/carbon/human/examine.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f4b2ee0323..8cd4c55d28 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -283,13 +283,13 @@ for(var/obj/item/organ/external/temp in organs) if(temp) if(temp.status & ORGAN_DESTROYED) - is_destroyed["[temp.display_name]"] = 1 - wound_flavor_text["[temp.display_name]"] = "[t_He] [t_is] missing [t_his] [temp.display_name].\n" + is_destroyed["[temp.name]"] = 1 + wound_flavor_text["[temp.name]"] = "[t_He] [t_is] missing [t_his] [temp.name].\n" continue if(temp.status & ORGAN_ROBOT) if(!(temp.brute_dam + temp.burn_dam)) if(!species.flags & IS_SYNTHETIC) - wound_flavor_text["[temp.display_name]"] = "[t_He] [t_has] a robot [temp.display_name]!\n" + wound_flavor_text["[temp.name]"] = "[t_He] [t_has] a robot [temp.name]!\n" continue else wound_flavor_text["[temp.name]"] = "[t_He] has a robot [temp.name]. It has[temp.get_wounds_desc()]!\n"