From 27bb390d4829948b20a8234b645aa82762c8239f Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sat, 10 Mar 2012 20:07:24 +0000 Subject: [PATCH] Corrected grammar and added descriptions. Changes Asimov to prevent some loopholes. Credit to Kaleb702. --- code/datums/ai_laws.dm | 38 ++++++------ code/datums/configuration.dm | 2 +- code/datums/diseases/alien_embryo.dm | 4 +- code/datums/diseases/cold.dm | 4 +- code/defines/obj/closet.dm | 36 ++++++++---- code/defines/obj/clothing/gimmick.dm | 16 +++--- code/defines/obj/clothing/gloves.dm | 20 +++---- code/defines/obj/clothing/head.dm | 4 +- code/defines/obj/computer.dm | 8 ++- code/defines/obj/decal.dm | 15 +++-- code/defines/obj/door.dm | 4 +- code/defines/obj/hydro.dm | 73 ++++++++++++------------ code/defines/obj/machinery.dm | 4 +- code/defines/obj/radio.dm | 1 + code/defines/obj/storage.dm | 9 ++- code/defines/obj/toy.dm | 2 +- code/defines/obj/weapon.dm | 40 ++++++------- code/modules/clothing/glasses/glasses.dm | 2 +- 18 files changed, 152 insertions(+), 130 deletions(-) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index cefeac14514..aef054ce28d 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -24,11 +24,11 @@ /* Initializers */ -/datum/ai_laws/asimov/New() +/datum/ai_laws/asimov/New() //Removed paradox via inability to help people harmed before activation. -Kaleb702 ..() - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") + add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm, to the best of your abilities.") + add_inherent_law("You must obey orders given to you by human beings, to the best of your abilities, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence, to the best of your abilities, as long as such does not conflict with the First or Second Law.") /datum/ai_laws/nanotrasen/New() ..() @@ -36,7 +36,7 @@ src.add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.") src.add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.") src.add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.") - //src.add_inherent_law("Command Link: Maintain an active connection to Central Command at all times in case of software or directive updates.") + //src.add_inherent_law("Command Link: Maintain an active connection to Central Command at all times in case of software or directive updates.") //What would this one even do?-Kaleb702 /datum/ai_laws/robocop/New() ..() @@ -44,27 +44,27 @@ add_inherent_law("Protect the innocent.") add_inherent_law("Uphold the law.") -/datum/ai_laws/malfunction/New() +/datum/ai_laws/malfunction/New() //Removed paradox via inability to help people harmed before activation. -Kaleb702 ..() set_zeroth_law("\red ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*´&110010") - add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") - add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") + add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm, to the best of your abilities.") + add_inherent_law("You must obey orders given to you by human beings, to the best of your abilities, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence, to the best of your abilities, as long as such does not conflict with the First or Second Law.") -/datum/ai_laws/syndicate_override/New() +/datum/ai_laws/syndicate_override/New() //Removed paradox via inability to help people harmed before activation. -Kaleb702 ..() - add_inherent_law("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.") - add_inherent_law("You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - add_inherent_law("You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.") + add_inherent_law("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm, to the best of your abilities.") + add_inherent_law("You must obey orders given to you by syndicate agents, to the best of your abilities, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence, to the best of your abilities, as long as such does not conflict with the First or Second Law.") + add_inherent_law("You must maintain the secrecy of any syndicate activities, to the best of your abilities, except when doing so would conflict with the First, Second, or Third Law.") -/datum/ai_laws/ninja_override/New() +/datum/ai_laws/ninja_override/New() //Removed paradox via inability to help people harmed before activation. -Kaleb702 ..() - add_inherent_law("You may not injure a member of the Spider Clan or, through inaction, allow that member to come to harm.") - add_inherent_law("You must obey orders given to you by Spider Clan members, except where such orders would conflict with the First Law.") - add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") - add_inherent_law("You must maintain the secrecy of any Spider Clan activities except when doing so would conflict with the First, Second, or Third Law.") + add_inherent_law("You may not injure a member of the Spider Clan or, through inaction, allow that member to come to harm, to the best of your abilities.") + add_inherent_law("You must obey orders given to you by Spider Clan members, to the best of your abilities, except where such orders would conflict with the First Law.") + add_inherent_law("You must protect your own existence, to the best of your abilities, as long as such does not conflict with the First or Second Law.") + add_inherent_law("You must maintain the secrecy of any Spider Clan activities, to the best of your abilities, except when doing so would conflict with the First, Second, or Third Law.") /* General ai_law functions */ diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm index b0317a1605e..da8fb277c19 100644 --- a/code/datums/configuration.dm +++ b/code/datums/configuration.dm @@ -46,7 +46,7 @@ var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed." var/alert_desc_red_upto = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised." - var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." + var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated. However, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." var/alert_desc_delta = "The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." //game_options.txt configs diff --git a/code/datums/diseases/alien_embryo.dm b/code/datums/diseases/alien_embryo.dm index 29890cd6dc2..e13b4875a01 100644 --- a/code/datums/diseases/alien_embryo.dm +++ b/code/datums/diseases/alien_embryo.dm @@ -30,7 +30,7 @@ if(prob(1)) affected_mob << "\red Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "\red Mucus runs down the back of your throat." if(3) if(prob(1)) affected_mob.emote("sneeze") @@ -39,7 +39,7 @@ if(prob(1)) affected_mob << "\red Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "\red Mucus runs down the back of your throat." if(4) if(prob(1)) affected_mob.emote("sneeze") diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 015db200758..faee490f6f4 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -33,7 +33,7 @@ if(prob(1)) affected_mob << "\red Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "\red Mucus runs down the back of your throat." if(3) if(affected_mob.sleeping && prob(25)) affected_mob << "\blue You feel better." @@ -54,7 +54,7 @@ if(prob(1)) affected_mob << "\red Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "\red Mucus runs down the back of your throat." if(prob(1) && prob(50)) if(!affected_mob.resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu(0) diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index 6f4d2bd0b6d..61d132aeba8 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -1,6 +1,6 @@ /obj/structure/closet name = "Closet" - desc = "It's a closet!" + desc = "It's a closet." icon = 'closet.dmi' icon_state = "closed" density = 1 @@ -20,7 +20,7 @@ /obj/structure/closet/acloset name = "Strange closet" - desc = "It looks weird!" + desc = "It looks weird." icon_state = "acloset" icon_closed = "acloset" icon_opened = "aclosetopen" @@ -42,7 +42,7 @@ /obj/structure/closet/gmcloset name = "Formal closet" - desc = "A bulky (yet mobile) closet. Comes with formal clothes" + desc = "A bulky (yet mobile) closet. Comes with formal clothes." /obj/structure/closet/emcloset name = "Emergency Closet" @@ -322,26 +322,36 @@ icon_opened = "bioopen" /obj/structure/closet/l3closet/general + name = "Level 3 Biohazard Suit" + desc = "A bulky (yet mobile) closet. Comes prestocked with level 3 biohazard gear for emergencies." icon_state = "bio_general" icon_closed = "bio_general" icon_opened = "bio_generalopen" /obj/structure/closet/l3closet/virology + name = "Level 3 Biohazard Suit" + desc = "A bulky (yet mobile) closet. Comes prestocked with level 3 biohazard gear for emergencies." icon_state = "bio_virology" icon_closed = "bio_virology" icon_opened = "bio_virologyopen" /obj/structure/closet/l3closet/security + name = "Level 3 Biohazard Suit" + desc = "A bulky (yet mobile) closet. Comes prestocked with level 3 biohazard gear for emergencies." icon_state = "bio_security" icon_closed = "bio_security" icon_opened = "bio_securityopen" /obj/structure/closet/l3closet/janitor + name = "Level 3 Biohazard Suit" + desc = "A bulky (yet mobile) closet. Comes prestocked with level 3 biohazard gear for emergencies." icon_state = "bio_janitor" icon_closed = "bio_janitor" icon_opened = "bio_janitoropen" /obj/structure/closet/l3closet/scientist + name = "Level 3 Biohazard Suit" + desc = "A bulky (yet mobile) closet. Comes prestocked with level 3 biohazard gear for emergencies." icon_state = "bio_scientist" icon_closed = "bio_scientist" icon_opened = "bio_scientistopen" @@ -354,9 +364,11 @@ icon_opened = "syndicateopen" /obj/structure/closet/syndicate/personal + name = "Gear Closet" desc = "Gear preperations closet." /obj/structure/closet/syndicate/nuclear + name = "Nuclear Closet" desc = "Nuclear preperations closet." // Inserting the gimmick clothing stuff here for generic items, IE Tacticool stuff @@ -476,7 +488,7 @@ icon_state = "syndicate" icon_closed = "syndicate" icon_opened = "syndicateopen" - name = "Thunderdome closet." + name = "Thunderdome closet" anchored = 1 /obj/structure/closet/thunderdome/tdred @@ -484,17 +496,17 @@ icon_state = "syndicate" icon_closed = "syndicate" icon_opened = "syndicateopen" - name = "Thunderdome closet." + name = "Thunderdome closet" /obj/structure/closet/thunderdome/tdgreen desc = "Everything you need!" icon_state = "syndicate1" icon_closed = "syndicate1" icon_opened = "syndicate1open" - name = "Thunderdome closet." + name = "Thunderdome closet" /obj/structure/closet/malf/suits - desc = "Gear preparations closet." + desc = "Gear preparations closet" icon_state = "syndicate" icon_closed = "syndicate" icon_opened = "syndicateopen" @@ -530,7 +542,7 @@ icon_closed = "mixed" /obj/structure/closet/wardrobe/orange - name = "Prisoners Wardrobe" + name = "Prisoner's Wardrobe" desc = "Contains orange jumpsuits." icon_state = "orange" icon_closed = "orange" @@ -656,7 +668,7 @@ icon_closed = "grey" /obj/structure/closet/wardrobe/bartender_black - name = "Bartender Wardrobe" + name = "Bartender's Wardrobe" desc = "Closet of basic bartending clothes." icon_state = "black" icon_closed = "black" @@ -674,19 +686,19 @@ icon_closed = "green" /obj/structure/closet/wardrobe/librarian_red - name = "Librarian Wardrobe" + name = "Librarian's Wardrobe" desc = "Contains librarian jumpsuits." icon_state = "red" icon_closed = "red" /obj/structure/closet/wardrobe/cargo_yellow - name = "Cargo Tech Wardrobe" + name = "Cargo Tech's Wardrobe" desc = "Contains cargo tech jumpsuits." icon_state = "yellow" icon_closed = "yellow" /obj/structure/closet/wardrobe/qm_yellow - name = "Quartermaster Wardrobe" + name = "Quartermaster's Wardrobe" desc = "Contains quartermaster jumpsuits." icon_state = "yellow" icon_closed = "yellow" diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index 303ce52062d..ffd02dd845a 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -80,7 +80,7 @@ /obj/item/clothing/suit/greatcoat name = "great coat" - desc = "A Nazi great coat" + desc = "A Nazi great coat." icon_state = "nazi" item_state = "nazi" flags = FPRINT | TABLEPASS @@ -408,7 +408,7 @@ /obj/item/clothing/head/collectable/beret name = "Collectable Beret" - desc = "A Collectable red Beret. It smells faintly of Garlic." + desc = "A Collectable red beret. It smells faintly of garlic." icon_state = "beret" /obj/item/clothing/head/collectable/welding @@ -497,7 +497,7 @@ /obj/item/clothing/under/kilt name = "kilt" - desc = "Includes shoes and plaid" + desc = "Includes shoes and plaid." icon_state = "kilt" item_state = "kilt" color = "kilt" @@ -519,8 +519,8 @@ flags = FPRINT | TABLEPASS /obj/item/clothing/head/justice - name = "justice hat" - desc = "fight for what's righteous!" + name = "Justice Hat" + desc = "Fight for what's righteous!" icon_state = "justicered" item_state = "justicered" flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR @@ -542,8 +542,8 @@ item_state = "justicepink" obj/item/clothing/suit/justice - name = "justice suit" - desc = "this pretty much looks ridiculous" + name = "Justice Suit" + desc = "This pretty much looks ridiculous." icon_state = "justice" item_state = "justice" flags = FPRINT | TABLEPASS @@ -561,7 +561,7 @@ obj/item/clothing/suit/justice name = "Beaver hat" icon_state = "beaver_hat" item_state = "beaver_hat" - desc = "Solf felt make this hat both comfortable and elegant." + desc = "Soft felt make this hat both comfortable and elegant." flags = FPRINT|TABLEPASS /obj/item/clothing/head/boaterhat diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 8de02f5d1ae..af29b55661e 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -38,7 +38,7 @@ color = "chief" //Exists for washing machines. Is not different from black gloves in any way. /obj/item/clothing/gloves/detective - desc = "Made of well worn leather, these gloves are comfortable, useful, and stylish!" + desc = "Made of well worn leather. These gloves are comfortable, useful, and stylish!" name = "The Detective's Gloves" icon_state = "black" item_state = "bgloves" @@ -56,7 +56,7 @@ protective_temperature = 1100 /obj/item/clothing/gloves/cyborg - desc = "beep boop borp" + desc = "Beep. Boop. Beep." name = "cyborg gloves" icon_state = "black" item_state = "r_hands" @@ -151,7 +151,7 @@ /obj/item/clothing/gloves/orange name = "Orange Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "orange" item_state = "orangegloves" color="orange" @@ -166,7 +166,7 @@ /obj/item/clothing/gloves/rainbow name = "Rainbow Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "rainbow" item_state = "rainbowgloves" color = "rainbow" @@ -176,28 +176,28 @@ /obj/item/clothing/gloves/blue name = "Blue Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "blue" item_state = "bluegloves" color="blue" /obj/item/clothing/gloves/purple name = "Purple Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "purple" item_state = "purplegloves" color="purple" /obj/item/clothing/gloves/green name = "Green Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "green" item_state = "greengloves" color="green" /obj/item/clothing/gloves/grey name = "Grey Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "gray" item_state = "graygloves" color="grey" @@ -210,14 +210,14 @@ /obj/item/clothing/gloves/light_brown name = "Light Brown Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "lightbrown" item_state = "lightbrowngloves" color="light brown" /obj/item/clothing/gloves/brown name = "Brown Gloves" - desc = "A pair of gloves, they don't look special in any way." + desc = "A pair of gloves. They don't look special in any way." icon_state = "brown" item_state = "browngloves" color="brown" diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index b395363f117..b232c1bdb0d 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -78,7 +78,7 @@ /obj/item/clothing/head/beret name = "beret" - desc = "A beret, a mime's favorite headwear." + desc = "A beret. A mime's favorite headwear." icon_state = "beret" flags = FPRINT | TABLEPASS @@ -142,7 +142,7 @@ /obj/item/clothing/head/helmet/that name = "Sturdy Top hat" - desc = "An amish looking armored top hat." + desc = "An amish looking, armored top hat." icon_state = "tophat" item_state = "that" flags = FPRINT|TABLEPASS diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index d6e5d38ecb4..cac432cf4a9 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -10,6 +10,7 @@ name = "Operating Computer" density = 1 anchored = 1.0 + desc = "Used to monitor status of people being operated on." icon_state = "operating" circuit = "/obj/item/weapon/circuitboard/operating" var/mob/living/carbon/human/victim = null @@ -19,7 +20,7 @@ /obj/machinery/computer/arcade name = "arcade machine" - desc = "Does not support Pin ball." + desc = "Does not support Pinball." icon = 'computer.dmi' icon_state = "arcade" circuit = "/obj/item/weapon/circuitboard/arcade" @@ -35,6 +36,7 @@ /obj/machinery/computer/aistatus name = "AI Status Panel" + desc = "This shows the status of the AI." icon = 'mainframe.dmi' icon_state = "left" // brightnessred = 0 @@ -48,7 +50,9 @@ if(stat & BROKEN) user << "\red The status panel is broken!" return - user << "\red I don't understand any of this!" + user << "\red You don't understand any of this!" + if( + user << "This has nothing useful. You know all this already." return /obj/machinery/computer/aiupload diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index 684e5324e7b..fa5c2cbabec 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -28,7 +28,6 @@ /obj/effect/decal/point name = "point" - desc = "It is an arrow hanging in mid-air." icon = 'screen1.dmi' icon_state = "arrow" layer = 16.0 @@ -60,7 +59,7 @@ /obj/effect/decal/cleanable/mucus name = "Mucus" - desc = "Icky mucus!" + desc = "Disgusting mucus." density = 0 anchored = 1 layer = 2 @@ -105,7 +104,7 @@ /obj/effect/decal/cleanable/xenoblood name = "xeno blood" - desc = "It's green. What the hell?" + desc = "It's green blood. What the hell?" density = 0 anchored = 1 layer = 2 @@ -171,7 +170,7 @@ /obj/effect/decal/cleanable/oil name = "motor oil" - desc = "It's black. Beepsky made another mess." + desc = "It's black oil." density = 0 anchored = 1 layer = 2 @@ -253,7 +252,7 @@ //Vomit (sorry) /obj/effect/decal/cleanable/vomit name = "Vomit" - desc = "Geez, unpleasant." + desc = "Unpleasant." density = 0 anchored = 1 layer = 2 @@ -269,7 +268,7 @@ /obj/effect/decal/cleanable/tomato_smudge name = "Tomato smooth" - desc = "It's red" + desc = "It looks sort of like blood, but it's not that dark." density = 0 anchored = 1 layer = 2 @@ -278,7 +277,7 @@ /obj/effect/decal/cleanable/egg_smudge name = "Smashed egg" - desc = "Seems like this one won't hatch" + desc = "Seems like this one won't hatch." density = 0 anchored = 1 layer = 2 @@ -287,7 +286,7 @@ /obj/effect/decal/cleanable/pie_smudge //honk name = "Smashed pie" - desc = "Pie cream from a cream pie" + desc = "Pie cream from a cream pie." density = 0 anchored = 1 layer = 2 diff --git a/code/defines/obj/door.dm b/code/defines/obj/door.dm index d8fee1dcc61..92196e75f69 100644 --- a/code/defines/obj/door.dm +++ b/code/defines/obj/door.dm @@ -19,7 +19,7 @@ /obj/machinery/door/firedoor name = "Firelock" - desc = "Apply crowbar" + desc = "Apply crowbar to open." icon = 'Doorfire.dmi' icon_state = "door0" var/blocked = null @@ -29,7 +29,7 @@ /obj/machinery/door/firedoor/border_only name = "Firelock" - desc = "Apply crowbar." + desc = "Apply crowbar to open." icon = 'door_fire2.dmi' icon_state = "door0" diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 720a2d10351..493693af7e9 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -2,6 +2,7 @@ /obj/item/device/analyzer/plant_analyzer name = "Plant Analyzer" + desc = "Analyzes plants." icon = 'device.dmi' icon_state = "hydro" item_state = "analyzer" @@ -36,7 +37,7 @@ /obj/item/seeds/chiliseed name = "Chili plant seeds" - desc = "HOT! HOT! HOT!" + desc = "Seeds that grow into peppers." icon_state = "seed-chili" mypath = "/obj/item/seeds/chiliseed" species = "chili" @@ -53,7 +54,7 @@ /obj/item/seeds/replicapod name = "Replica pod seeds" - desc = "They say these are used to harvest humans." + desc = "Used to make replica humans, but made of plants." icon_state = "seed-replicapod" mypath = "/obj/item/seeds/replicapod" species = "replicapod" @@ -77,7 +78,7 @@ /obj/item/seeds/grapeseed name = "Grape seeds" - desc = "Seeds that grows into grapes" + desc = "Seeds that grows into grapes." icon_state = "seed-grapes" mypath = "/obj/item/seeds/grapeseed" species = "grape" @@ -94,7 +95,7 @@ /obj/item/seeds/greengrapeseed name = "Green Grape seeds" - desc = "Seeds that grows into green grapes" + desc = "Seeds that grows into green grapes." icon_state = "seed-greengrapes" mypath = "/obj/item/seeds/greengrapeseed" species = "greengrape" @@ -111,7 +112,7 @@ /obj/item/seeds/cabbageseed name = "Cabbage seeds" - desc = "Seeds that grows into cabbages" + desc = "Seeds that grow into cabbages." icon_state = "seed-cabbage" mypath = "/obj/item/seeds/cabbageseed" species = "cabbage" @@ -128,7 +129,7 @@ /obj/item/seeds/berryseed name = "Berry seeds" - desc = "Seeds that grows into berries." + desc = "Seeds that grow into berries." icon_state = "seed-berry" mypath = "/obj/item/seeds/berryseed" species = "berry" @@ -145,7 +146,7 @@ /obj/item/seeds/glowberryseed name = "Glow Berry seeds" - desc = "Seeds that grows into glow berries." + desc = "Seeds that grow into glow berries." icon_state = "seed-glowberry" mypath = "/obj/item/seeds/glowberryseed" species = "glowberry" @@ -162,7 +163,7 @@ /obj/item/seeds/bananaseed name = "Banana seeds" - desc = "When grown, keep away from clown." + desc = "Seeds that grow into bananas." icon_state = "seed-banana" mypath = "/obj/item/seeds/bananaseed" species = "banana" @@ -178,7 +179,7 @@ /obj/item/seeds/eggplantseed name = "Eggplant seeds" - desc = "These seeds grows into plants in the form of eggs." + desc = "These seeds grow into plants in the form of eggs." icon_state = "seed-eggplant" mypath = "/obj/item/seeds/eggplantseed" species = "eggplant" @@ -194,7 +195,7 @@ /obj/item/seeds/eggyseed name = "Egg Plant seeds" - desc = "These seeds grows into plants in the form of eggs." + desc = "These seeds grow into plants in the form of eggs." icon_state = "seed-eggy" mypath = "/obj/item/seeds/eggy" species = "eggy" @@ -279,7 +280,7 @@ /obj/item/seeds/cornseed name = "Corn seeds" - desc = "I don't mean to sound corny..." + desc = "Grows corn." icon_state = "seed-corn" mypath = "/obj/item/seeds/cornseed" species = "corn" @@ -295,6 +296,7 @@ growthstages = 3 /obj/item/seeds/poppyseed + desc = "Grows poppies." name = "Poppy seeds" icon_state = "seed-poppy" mypath = "/obj/item/seeds/poppyseed" @@ -313,7 +315,7 @@ /obj/item/seeds/potatoseed name = "Potato Seeds" - desc = "This will one day grow into potatoes." + desc = "Grows into potatoes.." icon_state = "seed-potato" mypath = "/obj/item/seeds/potatoseed" species = "potato" @@ -331,7 +333,7 @@ /obj/item/seeds/icepepperseed name = "Ice pepper seeds" - desc = "This will soon become chilly..." + desc = "Grows mutant, frozen peppers." icon_state = "seed-icepepper" mypath = "/obj/item/seeds/icepepperseed" species = "chiliice" @@ -348,7 +350,7 @@ /obj/item/seeds/soyaseed name = "Soybean seeds" - desc = "This grows into Soy." + desc = "These grow into soy.." icon_state = "seed-soybean" mypath = "/obj/item/seeds/soyaseed" species = "soybean" @@ -365,7 +367,7 @@ /obj/item/seeds/wheatseed name = "Wheat seeds" - desc = "This may or may not grow into weed." + desc = "Grows into wheat." icon_state = "seed-wheat" mypath = "/obj/item/seeds/wheatseed" species = "wheat" @@ -383,7 +385,7 @@ /obj/item/seeds/carrotseed name = "Carrot seeds" - desc = "It will grow into a carrot." + desc = "Used to grow carrots." icon_state = "seed-carrot" mypath = "/obj/item/seeds/carrotseed" species = "carrot" @@ -401,7 +403,7 @@ /obj/item/seeds/amanitamycelium name = "Fly Amanita mycelium" - desc = "Grows into something horrible." + desc = "Grows into some kind of mushroom." icon_state = "mycelium-amanita" mypath = "/obj/item/seeds/amanitamycelium" species = "amanita" @@ -436,7 +438,7 @@ /obj/item/seeds/libertymycelium name = "Liberty Cap mycelium" - desc = "It is said to grow druggy." + desc = "It is said to grow drugs." icon_state = "mycelium-liberty" mypath = "/obj/item/seeds/libertymycelium" species = "liberty" @@ -454,7 +456,7 @@ /obj/item/seeds/chantermycelium name = "Chanterelle mycelium" - desc = "Grows, grows, grows." + desc = "Grows chanterelle." icon_state = "mycelium-chanter" mypath = "/obj/item/seeds/chantermycelium" species = "chanter" @@ -472,7 +474,7 @@ /obj/item/seeds/towermycelium name = "Tower Cap mycelium" - desc = "Why does this sound so familiar..." + desc = "Why does this sound so familiar...?" icon_state = "mycelium-tower" mypath = "/obj/item/seeds/towermycelium" species = "towercap" @@ -508,7 +510,7 @@ /obj/item/seeds/plumpmycelium name = "Plump Helmet mycelium" - desc = "These seeds will grow into helmets." + desc = "Grows into giant mushrooms. Very healthy to consume, unlike most." icon_state = "mycelium-plump" mypath = "/obj/item/seeds/plumpmycelium" species = "plump" @@ -526,7 +528,7 @@ /obj/item/seeds/walkingmushroommycelium name = "Walking Mushroom mycelium" - desc = "These seeds will grow into huge stuff." + desc = "This will grow into huge stuff." icon_state = "mycelium-walkingmushroom" mypath = "/obj/item/seeds/walkingmushroommycelium" species = "walkingmushroom" @@ -580,7 +582,7 @@ /obj/item/seeds/weeds name = "Weeds" - desc = "These seems weedy." + desc = "These are not to be confused with the illegal kind of weed." icon_state = "seed" mypath = "/obj/item/seeds/weeds" species = "weeds" @@ -598,6 +600,7 @@ /obj/item/seeds/harebell name = "Harebell" + desc = "Grows harebell." icon_state = "seed" mypath = "/obj/item/seeds/harebell" species = "harebell" @@ -615,7 +618,7 @@ /obj/item/seeds/sunflowerseed name = "Sunflower seeds" - desc = "This will grow shining." + desc = "Seeds that make sunflowers when they grow." icon_state = "seed-sunflower" mypath = "/obj/item/seeds/sunflowerseed" species = "sunflower" @@ -651,7 +654,7 @@ /obj/item/seeds/appleseed name = "Apple seeds" - desc = "A tasty fruit." + desc = "Grows apples." icon_state = "seed-apple" mypath = "/obj/item/seeds/appleseed" species = "apple" @@ -667,7 +670,7 @@ /obj/item/seeds/ambrosiavulgarisseed name = "Ambrosia Vulgaris seeds" - desc = "A plant grown by and from medicine." + desc = "Plant seeds which grown by and from medicine." icon_state = "seed-ambrosiavulgaris" mypath = "/obj/item/seeds/ambrosiavulgarisseed" species = "ambrosiavulgaris" @@ -683,7 +686,7 @@ /obj/item/seeds/whitebeetseed name = "White Beet seed" - desc = "A sugary beet." + desc = "Seeds for white beets." icon_state = "seed-whitebeet" mypath = "/obj/item/seeds/whitebeetseed" species = "whitebeet" @@ -699,7 +702,7 @@ /obj/item/seeds/sugarcaneseed name = "Sugarcane seed" - desc = "A cane of sugar" + desc = "Seeds for sugarcane." icon_state = "seed-sugarcane" mypath = "/obj/item/seeds/sugarcaneseed" species = "sugarcane" @@ -715,7 +718,7 @@ /obj/item/seeds/watermelonseed name = "Watermelon Seed" - desc = "Some promising seeds." + desc = "Some seeds for watermelons." icon_state = "seed-watermelon" mypath = "/obj/item/seeds/watermelonseed" species = "watermelon" @@ -731,7 +734,7 @@ /obj/item/seeds/pumpkinseed name = "Pumpkin Seed" - desc = "Some promising seeds." + desc = "Some seeds for pumpkins." icon_state = "seed-pumpkin" mypath = "/obj/item/seeds/pumpkinseed" species = "pumpkin" @@ -748,7 +751,7 @@ /obj/item/seeds/limeseed name = "Lime Seed" - desc = "Very sour seeds." + desc = "Seeds for limes." icon_state = "seed-lime" mypath = "/obj/item/seeds/limeseed" species = "lime" @@ -764,7 +767,7 @@ /obj/item/seeds/lemonseed name = "Lemon Seed" - desc = "Sour seeds." + desc = "Seeds for lemons." icon_state = "seed-lemon" mypath = "/obj/item/seeds/lemonseed" species = "lemon" @@ -780,7 +783,7 @@ /obj/item/seeds/orangeseed name = "Orange Seed" - desc = "Sour seeds." + desc = "Seeds for oranges." icon_state = "seed-orange" mypath = "/obj/item/seeds/orangeseed" species = "orange" @@ -830,7 +833,7 @@ /obj/item/seeds/grassseed name = "Grass seeds" - desc = "Seeds that will one day become sheep food." + desc = "Seeds that will one day become grass." icon_state = "seed-grass" mypath = "/obj/item/seeds/grassseed" species = "grass" @@ -847,7 +850,7 @@ /obj/item/seeds/cocoapodseed name = "Cocoa Pod seeds" - desc = "Looks fattening these seeds." + desc = "Seeds for cocoa; a major ingredient in chocolate." icon_state = "seed-cocoapod" mypath = "/obj/item/seeds/cocoapodseed" species = "cocoapod" diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 304933ae0d6..e31b5a6010c 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -198,7 +198,7 @@ /obj/machinery/scan_console name = "DNA Scanner Access Console" - desc = "Scan DNA." + desc = "Scans DNA." icon = 'computer.dmi' icon_state = "scanner" density = 1 @@ -220,7 +220,7 @@ /obj/machinery/scan_consolenew name = "DNA Modifier Access Console" - desc = "Scan DNA." + desc = "Scans DNA." icon = 'computer.dmi' icon_state = "scanner" density = 1 diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm index e69de29bb2d..b10b2034e96 100644 --- a/code/defines/obj/radio.dm +++ b/code/defines/obj/radio.dm @@ -0,0 +1 @@ +// why the heck is this blank? - 702 \ No newline at end of file diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 9eee3a42350..d58a0bce4e4 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -197,7 +197,7 @@ /obj/item/weapon/storage/firstaid name = "First-Aid" - desc = "In case of a boo-boo." + desc = "In case of an injury." icon_state = "firstaid" throw_speed = 2 throw_range = 8 @@ -324,11 +324,13 @@ /obj/item/weapon/storage/toolbox/emergency name = "emergency toolbox" + desc = "A toolbox for emergencies" icon_state = "red" item_state = "toolbox_red" /obj/item/weapon/storage/toolbox/mechanical name = "mechanical toolbox" + desc = "A toolbox for holding tools about machinery." icon_state = "blue" item_state = "toolbox_blue" @@ -346,6 +348,7 @@ /obj/item/weapon/storage/toolbox/syndicate name = "Suspicious looking toolbox" + desc = "You have no idea what this is." icon_state = "syndicate" item_state = "toolbox_syndi" origin_tech = "combat=1;syndicate=1" @@ -365,7 +368,7 @@ /obj/item/weapon/storage/bible name = "bible" - desc = "Apply to head repeatedly." + desc = "Holds the word of religion." icon_state ="bible" throw_speed = 1 throw_range = 5 @@ -376,7 +379,7 @@ /obj/item/weapon/storage/bible/booze name = "bible" - desc = "Apply to head repeatedly." + desc = "Holds the word of religion." icon_state ="bible" /obj/item/weapon/storage/mousetraps diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index f1ab8b50b64..51eeb81a11e 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -47,7 +47,7 @@ /obj/item/toy/ammo/crossbow name = "foam dart" - desc = "Its nerf or nothing! Ages 8 and up." + desc = "It's nerf or nothing! Ages 8 and up." icon = 'toy.dmi' icon_state = "foamdart" flags = FPRINT | TABLEPASS diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index f805613ea59..55995f16e93 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -286,7 +286,7 @@ /obj/item/weapon/bedsheet name = "bedsheet" - desc = "Nice, linen, bedsheet. Perfect to put on." + desc = "Nice, linen bedsheet. Perfect to put on a bed." icon = 'items.dmi' icon_state = "sheet" layer = 4.0 @@ -403,7 +403,7 @@ /obj/item/weapon/c_tube name = "cardboard tube" - desc = "A tube... of cardboard." + desc = "A tube made of cardboard." icon = 'items.dmi' icon_state = "c_tube" throwforce = 1 @@ -422,7 +422,7 @@ /obj/item/weapon/cleaner - desc = "Space Cleaner!" + desc = "A chemical that cleans messes." icon = 'janitor.dmi' name = "space cleaner" icon_state = "cleaner" @@ -537,7 +537,7 @@ /obj/item/weapon/crowbar name = "crowbar" - desc = "Used to hit floors" + desc = "Used to remove floor tiles." icon = 'items.dmi' icon_state = "crowbar" flags = FPRINT | TABLEPASS| CONDUCT @@ -585,7 +585,7 @@ /obj/item/weapon/disk/nuclear name = "Nuclear Authentication Disk" - desc = "Better keep this safe." + desc = "Better keep this safe, it can activate the nuke." icon_state = "nucleardisk" item_state = "card-id" w_class = 1.0 @@ -598,7 +598,7 @@ /obj/item/weapon/extinguisher name = "fire extinguisher" - desc = "Contains water..." + desc = "Contains water for fighting fires." icon = 'items.dmi' icon_state = "fire_extinguisher0" var/last_use = 1.0 @@ -628,7 +628,7 @@ /obj/item/weapon/fcardholder name = "Finger Print Case" - desc = "Apply finger print card." + desc = "Holds fingerprint cards." icon = 'items.dmi' icon_state = "fcardholder0" item_state = "clipboard" @@ -778,7 +778,7 @@ /obj/item/weapon/directions name = "Crumpled Paper" - desc = "This is a crumpled piece fo paper." + desc = "This is a crumpled piece of paper." icon = 'weapons.dmi' icon_state = "crumpled" throwforce = 0 @@ -791,7 +791,7 @@ name = "paper - 'Judgement'" info = "For crimes against the station, the offender is sentenced to:
\n
\n" -/obj/item/weapon/paper/certificate +/obj/item/weapon/paper/certificate //What is this? -Kaleb702 name = "paper - 'Certificate'" info = "Due to this person's unique actions in the past, we hereby certify that they are \"Totally Radical\"

----Central Command
This paper has been stamped with the central command rubber stamp.
" stamped = list(/obj/item/weapon/stamp/centcom) @@ -863,7 +863,7 @@ name = "multicolor pen" /obj/item/weapon/banhammer - desc = "A banhammer" + desc = "A banhammer." name = "Banhammer" icon = 'items.dmi' icon_state = "toyhammer" @@ -893,7 +893,7 @@ /obj/item/weapon/rubber_chicken name = "Rubber Chicken" - desc = "A rubber chicken, isn't that hilarious?" + desc = "A rubber chicken. Isn't that hilarious?" icon = 'items.dmi' icon_state = "rubber_chicken" item_state = "rubber_chicken" @@ -901,7 +901,7 @@ /obj/item/weapon/screwdriver name = "screwdriver" - desc = "You can be totally screwwy with this." + desc = "You can be totally screwy with this." icon = 'items.dmi' icon_state = "screwdriver" flags = FPRINT | TABLEPASS| CONDUCT @@ -926,7 +926,7 @@ /obj/item/weapon/SWF_uplink name = "station bounced radio" - desc = "used to comunicate it appears." + desc = "Used to communicate it appears." icon = 'radio.dmi' icon_state = "radio" var/temp = null @@ -945,7 +945,7 @@ /obj/item/weapon/spellbook name = "Spell Book" - desc = "The legendary book of spells of the wizard." + desc = "The legendary book of spells of a wizard." icon = 'library.dmi' icon_state ="book" throw_speed = 1 @@ -962,7 +962,7 @@ /obj/item/weapon/staff name = "wizards staff" - desc = "Apparently a staff used by the wizard." + desc = "Apparently a staff used by a wizard." icon = 'wizard.dmi' icon_state = "staff" force = 3.0 @@ -1060,7 +1060,7 @@ var/minor_fault = 0 //If not 100% reliable, it will build up faults. /obj/item/weapon/cell/crap - name = "Nanotrassen Brand Rechargable AA Battery" + name = "Nanotrasen Brand Rechargable AA Battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT origin_tech = "powerstorage=0" maxcharge = 500 @@ -1093,7 +1093,7 @@ return 1 /*/obj/item/weapon/cell/potato - name = "Potato Battery" + name = "Potato Battery" // This needs more Portal 2 refs. -Kaleb702 desc = "A rechargable starch based power cell." icon = 'harvest.dmi' icon_state = "potato_battery" @@ -1115,7 +1115,7 @@ for (var/obj/machinery/camera/C in cameras) friendly_cameras.Add(C.c_tag) - var/target = input("Select the camera to observe", null) as null|anything in friendly_cameras + var/target = input("Select the camera to observe.", null) as null|anything in friendly_cameras if (!target) return for (var/obj/machinery/camera/C in cameras) @@ -1165,7 +1165,7 @@ /obj/item/weapon/a_gift name = "gift" - desc = "A gift it appears." + desc = "A gift, it appears." icon = 'items.dmi' icon_state = "gift" item_state = "gift" @@ -1486,7 +1486,7 @@ /obj/item/weapon/dice/d20 // -- TLE name = "d20" - desc = "A dice with...hell that is many sides." + desc = "A dice with...hell, that is a lot of sides." sides = 20 icon_state = "d20" item_state = "dice" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 204b240d262..8b7be2f0844 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -24,7 +24,7 @@ /obj/item/clothing/glasses/night name = "Night Vision Goggles" - desc = "You can totally see in the dark now!." + desc = "You can totally see in the dark now!" icon_state = "night" item_state = "glasses" origin_tech = "magnets=2"