From 5370676e05655a726f4209e4303c7b58f46f5f4e Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 31 May 2012 18:39:10 -0700 Subject: [PATCH] Some fixes for Erthilo --- .../machinery/computer/HolodeckControl.dm | 11 ++++----- code/game/objects/devices/scanners.dm | 9 +++---- code/game/objects/items/weapons/medical.dm | 24 ++++++++----------- code/game/objects/tables_racks.dm | 10 ++++---- code/modules/mob/living/carbon/carbon.dm | 8 +++---- 5 files changed, 25 insertions(+), 37 deletions(-) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index d77454eb11a..90aed758954 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -417,8 +417,7 @@ log_admin("ATTACK: [G.assailant] ([G.assailant.ckey]) smashed [G.affecting] ([G.affecting.ckey]) on a table.") message_admins("ATTACK: [G.assailant] ([G.assailant.ckey]) smashed [G.affecting] ([G.affecting.ckey]) on a table.") log_attack("[G.assailant] ([G.assailant.ckey]) smashed [G.affecting] ([G.affecting.ckey]) on a table.") - var/list/proper_forms = H.get_visible_gender() - var/t_his = proper_forms["its"] + if(prob(25)) add_blood(G.affecting) affecting.take_damage(rand(10,15), 0) @@ -435,12 +434,12 @@ "\red You hear the nauseating crunch of bone and gristle on solid metal and the squeal of said metal deforming.") dented++ else if(prob(50)) - G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [t_his] bone and cartilage making a loud crunch!",\ - "\red You smash \the [H]'s head on \the [src], [t_his] bone and cartilage making a loud crunch!",\ + G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [H.get_gender_form("its")] bone and cartilage making a loud crunch!",\ + "\red You smash \the [H]'s head on \the [src], [H.get_gender_form("its")] bone and cartilage making a loud crunch!",\ "\red You hear the nauseating crunch of bone and gristle on solid metal, the noise echoing through the room.") else - G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [t_his] nose smashed and face bloodied!",\ - "\red You smash \the [H]'s head on \the [src], [t_his] nose smashed and face bloodied!",\ + G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [H.get_gender_form("its")] nose smashed and face bloodied!",\ + "\red You smash \the [H]'s head on \the [src], [H.get_gender_form("its")] nose smashed and face bloodied!",\ "\red You hear the nauseating crunch of bone and gristle on solid metal and the gurgling gasp of someone who is trying to breathe through their own blood.") else affecting.take_damage(rand(5,10), 0) diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index 1459e8d946a..a00f40089b8 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -134,9 +134,6 @@ MASS SPECTROMETER add_fingerprint(user) - var/list/proper_forms = user.get_visible_gender() - var/t_his = proper_forms["its"] - //Special case for blood splaters. if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune)) if(!isnull(A.blood_DNA)) @@ -146,7 +143,7 @@ MASS SPECTROMETER //General if ((!A.fingerprints || !A.fingerprints.len) && !A.suit_fibers && !A.blood_DNA) - user.visible_message("\The [user] scans \the [A] with \a [src], the air around [t_his] humming[prob(70) ? " gently." : "."]" ,\ + user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_gender_form("it")] humming[prob(70) ? " gently." : "."]" ,\ "\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\ "You hear a faint hum of electrical equipment.") return 0 @@ -174,12 +171,12 @@ MASS SPECTROMETER for(var/blood in A.blood_DNA) user << "Blood type: \red [A.blood_DNA[blood]] \t \black DNA: \red [blood]" if(prob(5)) - user.visible_message("\The [user] scans \the [A] with \a [src], the air around [t_his] humming[prob(70) ? " gently." : "."]" ,\ + user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_gender_form("it")] humming[prob(70) ? " gently." : "."]" ,\ "You finish scanning \the [A].",\ "You hear a faint hum of electrical equipment.") return 0 else - user.visible_message("\The [user] scans \the [A] with \a [src], the air around [t_his] humming[prob(70) ? " gently." : "."]\n[proper_forms["It"]] seems to perk up slightly at the readout." ,\ + user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.get_gender_form("it")] humming[prob(70) ? " gently." : "."]\n[user.get_gender_form("It")] seems to perk up slightly at the readout." ,\ "The results of the scan pique your interest.",\ "You hear a faint hum of electrical equipment, and someone making a thoughtful noise.") return 0 diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm index 4cbcd4ff37c..09996aa6216 100644 --- a/code/game/objects/items/weapons/medical.dm +++ b/code/game/objects/items/weapons/medical.dm @@ -21,10 +21,7 @@ MEDICAL user << "\red You don't have the dexterity to do this!" return 1 - var/list/proper_forms = user.get_visible_gender() - var/user_his = proper_forms["its"] - proper_forms = M.get_visible_gender() - var/target_his = proper_forms["its"] + var/stoppedblood = 0 if(hasorgans(M)) @@ -37,7 +34,7 @@ MEDICAL if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0) affecting = M:get_organ("head") if(affecting.destroyed && !affecting.gauzed) - user.visible_message("\red \The [user] does [user_his] best to stem \the [M]'s bleeding from [target_his] stump.", "\red You do your best to stop the bleeding from \the [M]'s stump.", "\red You hear something like gauze being ripped.") + user.visible_message("\red \The [user] does [user.get_gender_form("its")] best to stem \the [M]'s bleeding from [M.get_gender_form("its")] stump.", "\red You do your best to stop the bleeding from \the [M]'s stump.", "\red You hear something like gauze being ripped.") affecting.gauzed = 1 use(1) return @@ -70,7 +67,7 @@ MEDICAL if (M != user) user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] \the [M]'s cuts with \the [src].", "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] \the [M]'s [heal_burn? "burns" : "wounds"].", "\red You hear something like gauze being ripped.") else - user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] [user_his] own cuts with \the [src].", "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] your [heal_burn? "burns" : "wounds"].", "\red You hear something like gauze being ripped.") + user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] [user.get_gender_form("its")] own cuts with \the [src].", "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] your [heal_burn? "burns" : "wounds"].", "\red You hear something like gauze being ripped.") else if(user) user << "\red Nothing to patch up!" return @@ -139,11 +136,6 @@ MEDICAL user << "\red You don't have the dexterity to do this!" return 1 - var/list/proper_forms = user.get_visible_gender() - var/user_his = proper_forms["its"] - proper_forms = M.get_visible_gender() - var/target_his = proper_forms["its"] - var/stoppedblood = 0 if(hasorgans(M)) var/datum/organ/external/affecting = M:get_organ("chest") @@ -155,7 +147,7 @@ MEDICAL if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0) affecting = M:get_organ("head") if(affecting.destroyed && !affecting.gauzed) - M.visible_message("\red \The [user] does their best to stem \the [M]'s bleeding from [target_his] stump.", "\red You do your best to stop the bleeding from \the [M]'s stump.", "\red You hear something like gauze being ripped.") + M.visible_message("\red \The [user] does their best to stem \the [M]'s bleeding from [M.get_gender_form("its")] stump.", "\red You do your best to stop the bleeding from \the [M]'s stump.", "\red You hear something like gauze being ripped.") affecting.gauzed = 1 use(1) return @@ -177,9 +169,13 @@ MEDICAL if (user && stoppedblood) if (M != user) - user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] \the [M]'s cuts with \the [src].", "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] \the [M]'s [heal_burn? "burns" : "wounds"].", "\red You hear something like gauze being ripped.") + user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] \the [M]'s cuts with \the [src].",\ + "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] \the [M]'s [heal_burn? "burns" : "wounds"].",\ + "\red You hear something like gauze being ripped.") else - user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] [user_his] own cuts with \the [src].", "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] your [heal_burn? "burns" : "wounds"].", "\red You hear something like gauze being ripped.") + user.visible_message("\red \The [user] [heal_burn? "salves" : "bandages"] [stoppedblood - 1 ? "some of" : "the last of"] [user.get_gender_form("its")] own cuts with \the [src].",\ + "\red You [heal_burn? "salve" : "bandage up"] [stoppedblood - 1 ? "some of" : "the last of"] your [heal_burn? "burns" : "wounds"].",\ + "\red You hear something like gauze being ripped.") else if(user) user << "\red Nothing to patch up!" return diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index 65467243cb5..5f8343a3c08 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -154,8 +154,6 @@ TABLE AND RACK OBJECT INTERATIONS var/mob/living/carbon/human/H = G.affecting var/datum/organ/external/affecting = H.get_organ("head") - var/list/proper_forms = H.get_visible_gender() - var/t_his = proper_forms["its"] if(prob(25)) add_blood(G.affecting) affecting.take_damage(rand(10,15), 0) @@ -172,12 +170,12 @@ TABLE AND RACK OBJECT INTERATIONS "\red You hear the nauseating crunch of bone and gristle on solid metal and the squeal of said metal deforming.") dented++ else if(prob(50)) - G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [t_his] bone and cartilage making a loud crunch!",\ - "\red You smash \the [H]'s head on \the [src], [t_his] bone and cartilage making a loud crunch!",\ + G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [H.get_gender_form("its")] bone and cartilage making a loud crunch!",\ + "\red You smash \the [H]'s head on \the [src], [H.get_gender_form("its")] bone and cartilage making a loud crunch!",\ "\red You hear the nauseating crunch of bone and gristle on solid metal, the noise echoing through the room.") else - G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [t_his] nose smashed and face bloodied!",\ - "\red You smash \the [H]'s head on \the [src], [t_his] nose smashed and face bloodied!",\ + G.assailant.visible_message("\red [G.assailant] smashes \the [H]'s head on \the [src], [H.get_gender_form("its")] nose smashed and face bloodied!",\ + "\red You smash \the [H]'s head on \the [src], [H.get_gender_form("its")] nose smashed and face bloodied!",\ "\red You hear the nauseating crunch of bone and gristle on solid metal and the gurgling gasp of someone who is trying to breathe through their own blood.") else affecting.take_damage(rand(5,10), 0) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index dc36f01ca75..8da3cd6a383 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -204,8 +204,7 @@ if(src == M && istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M var/list/damaged = H.get_damaged_organs(1,1) - var/list/proper_forms = get_visible_gender() - visible_message("\blue [src] examines [proper_forms["its"]]self.", \ + visible_message("\blue [src] examines [get_gender_form("itsself")].", \ "\blue You check yourself for injuries.", \ "You hear a rustle, as someone checks about their person.") @@ -255,10 +254,9 @@ AdjustStunned(-3) AdjustWeakened(-3) playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1) - var/list/proper_forms = get_visible_gender() M.visible_message( \ - "\blue \The [M] shakes \the [src] trying to wake [proper_forms["it"]] up!", \ - "\blue You shake \the [src] trying to wake [proper_forms["it"]] up!", \ + "\blue \The [M] shakes \the [src] trying to wake [get_gender_form("it")] up!", \ + "\blue You shake \the [src] trying to wake [get_gender_form("it")] up!", \ "You hear someone get shaken.") /mob/living/carbon/proc/eyecheck()