diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 036e584d7fe..fe94e701dc2 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -7,7 +7,7 @@ AI MODULES // AI module /obj/item/weapon/aiModule - name = "AI Module" + name = "\improper AI module" icon = 'icons/obj/module.dmi' icon_state = "std_mod" item_state = "electronic" @@ -87,7 +87,7 @@ AI MODULES /******************** Safeguard ********************/ /obj/item/weapon/aiModule/safeguard - name = "'Safeguard' AI Module" + name = "\improper 'Safeguard' AI module" var/targetName = "" desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not human and are a threat to humans.'" origin_tech = "programming=3;materials=4" @@ -116,7 +116,7 @@ AI MODULES /******************** OneHuman ********************/ /obj/item/weapon/aiModule/oneHuman - name = "'OneHuman' AI Module" + name = "\improper 'OneHuman' AI module" var/targetName = "" desc = "A 'one human' AI module: 'Only is human.'" origin_tech = "programming=3;materials=6" //made with diamonds! @@ -148,7 +148,7 @@ AI MODULES /******************** ProtectStation ********************/ /obj/item/weapon/aiModule/protectStation - name = "'ProtectStation' AI Module" + name = "\improper 'ProtectStation' AI module" desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.'" origin_tech = "programming=3;materials=4" //made of gold @@ -196,7 +196,7 @@ AI MODULES /******************** Quarantine ********************/ /obj/item/weapon/aiModule/quarantine - name = "'Quarantine' AI Module" + name = "\improper 'Quarantine' AI module" desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.'" origin_tech = "programming=3;biotech=2;materials=4" @@ -212,7 +212,7 @@ AI MODULES /******************** OxygenIsToxicToHumans ********************/ /obj/item/weapon/aiModule/oxygen - name = "'OxygenIsToxicToHumans' AI Module" + name = "\improper 'OxygenIsToxicToHumans' AI module" desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.'" origin_tech = "programming=3;biotech=2;materials=4" @@ -249,7 +249,7 @@ AI MODULES /****************** New Freeform ******************/ /obj/item/weapon/aiModule/freeform // Slightly more dynamic freeform module -- TLE - name = "'Freeform' AI Module" + name = "\improper 'Freeform' AI module" var/newFreeFormLaw = "freeform" var/lawpos = 15 desc = "A 'freeform' AI module: ''" @@ -284,7 +284,7 @@ AI MODULES /******************** Reset ********************/ /obj/item/weapon/aiModule/reset - name = "'Reset' AI Module" + name = "\improper 'Reset' AI module" var/targetName = "name" desc = "A 'reset' AI module: 'Clears all laws except for the core three.'" origin_tech = "programming=3;materials=4" @@ -301,7 +301,7 @@ AI MODULES /******************** Purge ********************/ /obj/item/weapon/aiModule/purge // -- TLE - name = "'Purge' AI Module" + name = "\improper 'Purge' AI module" desc = "A 'purge' AI Module: 'Purges all laws.'" origin_tech = "programming=3;materials=6" @@ -317,7 +317,7 @@ AI MODULES /******************** Asimov ********************/ /obj/item/weapon/aiModule/asimov // -- TLE - name = "'Asimov' Core AI Module" + name = "\improper 'Asimov' core AI module" desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = "programming=3;materials=4" @@ -351,7 +351,7 @@ AI MODULES /******************** Corporate ********************/ /obj/item/weapon/aiModule/corp - name = "'Corporate' Core AI Module" + name = "\improper 'Corporate' core AI module" desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = "programming=3;materials=4" @@ -368,7 +368,7 @@ AI MODULES /****************** P.A.L.A.D.I.N. **************/ /obj/item/weapon/aiModule/paladin // -- NEO - name = "'P.A.L.A.D.I.N.' Core AI Module" + name = "\improper 'P.A.L.A.D.I.N.' core AI module" desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = "programming=3;materials=6" @@ -385,7 +385,7 @@ AI MODULES /****************** T.Y.R.A.N.T. *****************/ /obj/item/weapon/aiModule/tyrant // -- Darem - name = "'T.Y.R.A.N.T.' Core AI Module" + name = "\improper 'T.Y.R.A.N.T.' core AI module" desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = "programming=3;materials=6;syndicate=2" @@ -402,7 +402,7 @@ AI MODULES /******************** Freeform Core ******************/ /obj/item/weapon/aiModule/freeformcore // Slightly more dynamic freeform module -- TLE - name = "'Freeform' Core AI Module" + name = "\improper 'Freeform' core AI module" var/newFreeFormLaw = "" desc = "A 'freeform' Core AI module: ''" origin_tech = "programming=3;materials=6" @@ -427,7 +427,7 @@ AI MODULES ..() /obj/item/weapon/aiModule/syndicate // Slightly more dynamic freeform module -- TLE - name = "Hacked AI Module" + name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" origin_tech = "programming=3;materials=6;syndicate=7" @@ -459,7 +459,7 @@ AI MODULES /******************** Robocop ********************/ /obj/item/weapon/aiModule/robocop // -- TLE - name = "'Robocop' Core AI Module" + name = "\improper 'Robocop' core AI module" desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'" origin_tech = "programming=4" @@ -476,7 +476,7 @@ AI MODULES /******************** Antimov ********************/ /obj/item/weapon/aiModule/antimov // -- TLE - name = "'Antimov' Core AI Module" + name = "\improper 'Antimov' core AI module" desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = "programming=4" diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 870b881eda3..7d4db127c87 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -35,14 +35,14 @@ set src in usr if (t) - src.name = text("Data Disk- '[]'", t) + src.name = text("data disk- '[]'", t) else - src.name = "Data Disk" + src.name = "data disk" src.add_fingerprint(usr) return /obj/item/weapon/card/data/clown - name = "coordinates to clown planet" + name = "\proper the coordinates to clown planet" icon_state = "data" item_state = "card-id" layer = 3 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 87720c5f2c7..ac80658f27c 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -195,7 +195,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM // CIGARS // //////////// /obj/item/clothing/mask/cigarette/cigar - name = "Premium Cigar" + name = "premium cigar" desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!" icon_state = "cigaroff" icon_on = "cigaron" @@ -207,14 +207,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM chem_volume = 20 /obj/item/clothing/mask/cigarette/cigar/cohiba - name = "Cohiba Robusto Cigar" + name = "\improper Cohiba Robusto cigar" desc = "There's little more you could want from a cigar." icon_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" /obj/item/clothing/mask/cigarette/cigar/havana - name = "Premium Havanian Cigar" + name = "premium Havanian cigar" desc = "A cigar fit for only the best for the best." icon_state = "cigar2off" icon_on = "cigar2on" @@ -337,7 +337,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/lit = 0 /obj/item/weapon/lighter/zippo - name = "Zippo lighter" + name = "\improper Zippo lighter" desc = "The zippo." icon_state = "zippo" item_state = "zippo" diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 39a058a196a..d473343e61f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -1,4 +1,5 @@ /obj/item/weapon/lipstick + gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." icon = 'icons/obj/items.dmi' diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 0edd1a87362..535a4264c0b 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 /obj/machinery/implantchair - name = "Loyalty Implanter" + name = "loyalty implanter" desc = "Used to implant occupants with loyalty implants." icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair" diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index d70c2615aaf..534634529d6 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -179,7 +179,7 @@ * Bucher's cleaver */ /obj/item/weapon/butch - name = "butcher's Cleaver" + name = "butcher's cleaver" icon = 'icons/obj/kitchen.dmi' icon_state = "butch" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 13fb8a9d121..4d7768e71de 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -68,7 +68,7 @@ var/global/list/cached_icons = list() paint_type = "remover" /* /obj/item/weapon/paint - name = "Paint Can" + name = "paint can" desc = "Used to recolor floors and walls. Can not be removed by the janitor." icon = 'icons/obj/items.dmi' icon_state = "paint_neutral" @@ -77,43 +77,51 @@ var/global/list/cached_icons = list() w_class = 3.0 /obj/item/weapon/paint/red - name = "Red paint" + gender= PLURAL + name = "red paint" color = "FF0000" icon_state = "paint_red" /obj/item/weapon/paint/green - name = "Green paint" + gender= PLURAL + name = "green paint" color = "00FF00" icon_state = "paint_green" /obj/item/weapon/paint/blue - name = "Blue paint" + gender= PLURAL + name = "blue paint" color = "0000FF" icon_state = "paint_blue" /obj/item/weapon/paint/yellow - name = "Yellow paint" + gender= PLURAL + name = "yellow paint" color = "FFFF00" icon_state = "paint_yellow" /obj/item/weapon/paint/violet - name = "Violet paint" + gender= PLURAL + name = "violet paint" color = "FF00FF" icon_state = "paint_violet" /obj/item/weapon/paint/black - name = "Black paint" + gender= PLURAL + name = "black paint" color = "333333" icon_state = "paint_black" /obj/item/weapon/paint/white - name = "White paint" + gender= PLURAL + name = "white paint" color = "FFFFFF" icon_state = "paint_white" /obj/item/weapon/paint/anycolor - name = "Any color" + gender= PLURAL + name = "any color" icon_state = "paint_neutral" attack_self(mob/user as mob) @@ -156,7 +164,8 @@ var/global/list/cached_icons = list() return /obj/item/weapon/paint/paint_remover - name = "Paint remover" + gender = PLURAL + name = "paint remover" icon_state = "paint_neutral" afterattack(turf/target, mob/user as mob) diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 0f0ea000ca2..1ee12faf0f9 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -36,7 +36,7 @@ charge = 0 /obj/item/weapon/cell/secborg - name = "\improper Security borg rechargable D battery" + name = "security borg rechargable D battery" origin_tech = "powerstorage=0" maxcharge = 600 //600 max charge / 100 charge per shot = six shots g_amt = 40 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 14a00b55134..acfde88e2b3 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -23,7 +23,7 @@ */ /obj/item/weapon/storage/backpack/holding - name = "Bag of Holding" + name = "bag of holding" desc = "A backpack that opens into a localized pocket of Blue Space." origin_tech = "bluespace=4" icon_state = "holdingpack" @@ -84,7 +84,7 @@ icon_state = "cultpack" /obj/item/weapon/storage/backpack/clown - name = "Giggles Von Honkerton" + name = "Giggles von Honkerton" desc = "It's a backpack made by Honk! Co." icon_state = "clownpack" item_state = "clownpack" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 6a4375ce7e1..91c68bd1e74 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -59,7 +59,7 @@ new /obj/item/clothing/gloves/latex(src) /obj/item/weapon/storage/box/masks - name = "sterile masks" + name = "box of sterile masks" desc = "This box contains masks of sterility." icon_state = "sterile" @@ -75,7 +75,7 @@ /obj/item/weapon/storage/box/syringes - name = "syringes" + name = "box of syringes" desc = "A box full of syringes." desc = "A biohazard alert warning is printed on the box" icon_state = "syringe" @@ -91,7 +91,7 @@ new /obj/item/weapon/reagent_containers/syringe( src ) /obj/item/weapon/storage/box/beakers - name = "beaker box" + name = "box of beakers" icon_state = "beaker" New() @@ -105,7 +105,7 @@ new /obj/item/weapon/reagent_containers/glass/beaker( src ) /obj/item/weapon/storage/box/injectors - name = "\improper DNA injectors" + name = "box of DNA injectors" desc = "This box contains injectors it seems." New() @@ -150,7 +150,7 @@ new /obj/item/weapon/grenade/flashbang(src) /obj/item/weapon/storage/box/emps - name = "emp grenades" + name = "box of emp grenades" desc = "A box with 5 emp grenades." icon_state = "flashbang" @@ -164,7 +164,7 @@ /obj/item/weapon/storage/box/trackimp - name = "tracking implant kit" + name = "boxed tracking implant kit" desc = "Box full of scum-bag tracking utensils." icon_state = "implant" @@ -179,7 +179,7 @@ new /obj/item/weapon/locator(src) /obj/item/weapon/storage/box/chemimp - name = "chemical implant kit" + name = "boxed chemical implant kit" desc = "Box of stuff used to implant chemicals." icon_state = "implant" @@ -194,8 +194,9 @@ new /obj/item/weapon/implantpad(src) + /obj/item/weapon/storage/box/rxglasses - name = "prescription glasses" + name = "box of prescription glasses" desc = "This box contains nerd glasses." icon_state = "glasses" @@ -319,7 +320,7 @@ new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src) /obj/item/weapon/storage/box/ids - name = "spare IDs" + name = "box of spare IDs" desc = "Has so many empty IDs." icon_state = "id" @@ -333,8 +334,9 @@ new /obj/item/weapon/card/id(src) new /obj/item/weapon/card/id(src) + /obj/item/weapon/storage/box/seccarts - name = "Spare R.O.B.U.S.T. Cartridges" + name = "box of spare R.O.B.U.S.T. Cartridges" desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security." icon_state = "pda" @@ -350,7 +352,7 @@ /obj/item/weapon/storage/box/handcuffs - name = "spare handcuffs" + name = "box of spare handcuffs" desc = "A box full of handcuffs." icon_state = "handcuff" @@ -364,8 +366,9 @@ new /obj/item/weapon/handcuffs(src) new /obj/item/weapon/handcuffs(src) + /obj/item/weapon/storage/box/mousetraps - name = "box of Pest-B-Gon Mousetraps" + name = "box of Pest-B-Gon mousetraps" desc = "WARNING: Keep out of reach of children." icon_state = "mousetraps" @@ -439,7 +442,7 @@ new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src) /obj/item/weapon/storage/box/lights - name = "replacement bulbs" + name = "box of replacement bulbs" icon = 'icons/obj/storage.dmi' icon_state = "light" desc = "This box is shaped on the inside so that only light tubes and bulbs fit." @@ -456,7 +459,7 @@ new /obj/item/weapon/light/bulb(src) /obj/item/weapon/storage/box/lights/tubes - name = "replacement tubes" + name = "box of replacement tubes" icon_state = "lighttube" /obj/item/weapon/storage/box/lights/tubes/New() @@ -465,7 +468,7 @@ new /obj/item/weapon/light/tube(src) /obj/item/weapon/storage/box/lights/mixed - name = "replacement lights" + name = "box of replacement lights" icon_state = "lightmixed" /obj/item/weapon/storage/box/lights/mixed/New() @@ -473,4 +476,4 @@ for(var/i = 0; i < 14; i++) new /obj/item/weapon/light/tube(src) for(var/i = 0; i < 7; i++) - new /obj/item/weapon/light/bulb(src) + new /obj/item/weapon/light/bulb(src) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index cd0b988bea7..119d2d2c22e 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -81,7 +81,7 @@ */ /obj/item/weapon/storage/fancy/candle_box - name = "Candle pack" + name = "candle pack" desc = "A pack of red candles." icon = 'icons/obj/candle.dmi' icon_state = "candlebox5" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index e6347e8e3fc..0c0ecf2f71f 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -149,7 +149,7 @@ return /obj/item/weapon/storage/pill_bottle/kelotane - name = "Pill bottle (kelotane)" + name = "pill bottle (kelotane)" desc = "Contains pills used to treat burns." New() @@ -163,7 +163,7 @@ new /obj/item/weapon/reagent_containers/pill/kelotane( src ) /obj/item/weapon/storage/pill_bottle/antitox - name = "Pill bottle (Anti-toxin)" + name = "pill bottle (Anti-toxin)" desc = "Contains pills used to counter toxins." New() @@ -177,7 +177,7 @@ new /obj/item/weapon/reagent_containers/pill/antitox( src ) /obj/item/weapon/storage/pill_bottle/inaprovaline - name = "Pill bottle (inaprovaline)" + name = "pill bottle (inaprovaline)" desc = "Contains pills used to stabilize patients." New() diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index ec0e17efb5b..daf9d89f389 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -67,7 +67,7 @@ /obj/item/weapon/storage/lockbox/loyalty - name = "Lockbox (Loyalty Implants)" + name = "lockbox (Loyalty Implants)" req_access = list(access_security) New() diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 646fc4d244c..ea7c9bdd902 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -69,12 +69,12 @@ return /obj/item/weapon/storage/box/syndie_kit - name = "Box" + name = "box" desc = "A sleek, sturdy box" icon_state = "box_of_doom" /obj/item/weapon/storage/box/syndie_kit/imp_freedom - name = "Freedom Implant (with injector)" + name = "boxed freedom implant (with injector)" /obj/item/weapon/storage/box/syndie_kit/imp_freedom/New() ..() @@ -100,7 +100,7 @@ return /obj/item/weapon/storage/box/syndie_kit/imp_uplink - name = "Uplink Implant (with injector)" + name = "boxed uplink implant (with injector)" /obj/item/weapon/storage/box/syndie_kit/imp_uplink/New() ..() @@ -110,7 +110,7 @@ return /obj/item/weapon/storage/box/syndie_kit/space - name = "Space Suit and Helmet" + name = "boxed space suit and helmet" /obj/item/weapon/storage/box/syndie_kit/space/New() ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index a9a767b84bc..c6cf316b2bc 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -1,5 +1,5 @@ /obj/structure/displaycase - name = "Display Case" + name = "display case" icon = 'icons/obj/stationobjs.dmi' icon_state = "glassbox1" desc = "A display case for prized possessions. It taunts you to kick it." diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 6856c706341..469cacdd742 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,7 +1,7 @@ obj/structure/door_assembly icon = 'icons/obj/doors/door_assembly.dmi' - name = "Airlock Assembly" + name = "airlock assembly" icon_state = "door_as_0" anchored = 0 density = 1