From 1cd49a6f136640e3614561150038d66c6d0fe4df Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Mon, 28 Nov 2011 19:39:22 +0000 Subject: [PATCH] Replacing monkie with monkey... Replaced 11 strings in 8 files Shout at me if this breaks anything. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2569 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/diseases/jungle_fever.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/objects/storage/backpack.dm | 2 +- code/modules/admin/admin.dm | 2 +- code/modules/food/food.dm | 6 +++--- code/modules/food/recipes_microwave.dm | 4 ++-- code/modules/mob/living/carbon/human/life.dm | 2 +- code/unused/computer2/med_rec.dm | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/diseases/jungle_fever.dm b/code/datums/diseases/jungle_fever.dm index 31769dad902..dba0c5f4a4f 100644 --- a/code/datums/diseases/jungle_fever.dm +++ b/code/datums/diseases/jungle_fever.dm @@ -6,7 +6,7 @@ spread_type = SPECIAL affected_species = list("Monkey", "Human") curable = 0 - desc = "Monkies with this disease will bite humans, causing humans to spontaneously mutate into a monkey." + desc = "monkeys with this disease will bite humans, causing humans to spontaneously mutate into a monkey." severity = "Medium" //stage_prob = 100 agent = "Kongey Vibrion M-909" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 203c982f68d..7949cbae652 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -322,7 +322,7 @@ Neutralize All Unidentified Life Signs: []
"}, continue // if threat level < 4, keep going else if (istype(C, /mob/living/carbon/monkey) || istype(C, /mob/living/silicon)) - continue // Don't target monkies or borgs/AIs you dumb shit + continue // Don't target monkeys or borgs/AIs you dumb shit var/dst = get_dist(src, C) // if it's too far away, why bother? if (dst > 12) diff --git a/code/game/objects/storage/backpack.dm b/code/game/objects/storage/backpack.dm index 34732b8e16a..39dacabfd4f 100644 --- a/code/game/objects/storage/backpack.dm +++ b/code/game/objects/storage/backpack.dm @@ -3,7 +3,7 @@ // if (src.loc != usr) // return // if ((istype(usr, /mob/living/carbon/human) || (ticker && ticker.mode.name == "monkey"))) - if (ishuman(usr) || ismonkey(usr)) //so monkies can take off their backpacks -- Urist + if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist var/mob/M = usr if (!( istype(over_object, /obj/screen) )) return ..() diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 89684bc2d47..f6139543848 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1969,7 +1969,7 @@ Remove 'internal' clothing
Remove ALL clothing
Toxic Air (WARNING: dangerous)
-Turn all humans into monkies
+Turn all humans into monkeys
Remove firesuits, grilles, and pods
Make all areas powered
Make all areas unpowered
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 6397c91a3e5..d0cbbdfe57b 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1106,10 +1106,10 @@ reagents.add_reagent("capsaicin", 6) bitesize = 4 -/obj/item/weapon/reagent_containers/food/snacks/monkiesdelight - name = "Monkie's Delight" +/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight + name = "monkey's Delight" desc = "Eeee Eee!" - icon_state = "monkiesdelight" + icon_state = "monkeysdelight" trash = "tray" New() ..() diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 5a8babba505..076890065eb 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -703,14 +703,14 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread -/datum/recipe/monkiesdelight +/datum/recipe/monkeysdelight reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( /obj/item/weapon/reagent_containers/food/snacks/monkeycube, /obj/item/weapon/reagent_containers/food/snacks/grown/banana, /obj/item/weapon/reagent_containers/food/snacks/flour, ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkiesdelight + result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight /datum/recipe/baguette reagents = list("sodiumchloride" = 1, "blackpepper" = 1) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0dca6698dda..bfd06d3a35b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -158,7 +158,7 @@ if (prob(7)) switch(pick(1,2,3)) if(1) - say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH MONKIES", "stop grifing me!!!!", "SOTP IT#")) + say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#")) if(2) say(pick("fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom")) if(3) diff --git a/code/unused/computer2/med_rec.dm b/code/unused/computer2/med_rec.dm index a017366f6ab..8cb06a40c28 100644 --- a/code/unused/computer2/med_rec.dm +++ b/code/unused/computer2/med_rec.dm @@ -171,7 +171,7 @@
Possible Cure: None
Affected Species: Monkey
-
Notes: Monkies with this disease will bite humans, causing humans to spontaneously to mutate into a monkey. +
Notes: monkeys with this disease will bite humans, causing humans to spontaneously to mutate into a monkey.

Severity: Medium"} if("ca")