From 109c1065c7362dc50a63603a6789f19c9993e365 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Wed, 20 Nov 2013 18:03:41 +0100 Subject: [PATCH 1/2] code/game/objects/effects/* lowercase pass NOTE: created a baseclass for /obj/effect/decal/remains/* --- code/game/objects/effects/aliens.dm | 4 +++- code/game/objects/effects/decals/remains.dm | 17 ++++++----------- code/game/objects/effects/effect_system.dm | 1 + code/game/objects/effects/mines.dm | 12 ++++++------ 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index e070acb84b6..88d728ed76c 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -42,7 +42,7 @@ /obj/structure/alien/resin/CanAtmosPass() return !density - + /obj/structure/alien/resin/wall name = "resin wall" desc = "Purple slime solidified into a wall." @@ -140,6 +140,7 @@ #define NODERANGE 3 /obj/structure/alien/weeds + gender = PLURAL name = "weeds" desc = "Weird purple weeds." icon_state = "weeds" @@ -376,6 +377,7 @@ * Acid */ /obj/effect/acid + gender = PLURAL name = "acid" desc = "Burbling corrossive stuff." icon = 'icons/effects/effects.dmi' diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index d50d595d3ea..f98e5922f82 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -1,23 +1,18 @@ -/obj/effect/decal/remains/human +/obj/effect/decal/remains name = "remains" - desc = "They look like human remains. They have a strange aura about them." gender = PLURAL icon = 'icons/effects/blood.dmi' - icon_state = "remains" anchored = 1 +/obj/effect/decal/remains/human + desc = "They look like human remains. They have a strange aura about them." + icon_state = "remains" + /obj/effect/decal/remains/xeno - name = "remains" desc = "They look like the remains of something... alien. They have a strange aura about them." - gender = PLURAL - icon = 'icons/effects/blood.dmi' icon_state = "remainsxeno" - anchored = 1 /obj/effect/decal/remains/robot - name = "remains" desc = "They look like the remains of something mechanical. They have a strange aura about them." - gender = PLURAL icon = 'icons/mob/robots.dmi' - icon_state = "remainsrobot" - anchored = 1 \ No newline at end of file + icon_state = "remainsrobot" \ No newline at end of file diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 52caa19ef80..ea495a85ff2 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -914,6 +914,7 @@ steam.start() -- spawns the effect anchored = 1 name = "foamed metal" desc = "A lightweight foamed metal wall." + gender = PLURAL var/metal = 1 // 1=aluminum, 2=iron New() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index b658407247c..0e46105b06c 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -1,5 +1,5 @@ /obj/effect/mine - name = "Mine" + name = "mine" desc = "I Better stay away from that thing." density = 1 anchored = 1 @@ -69,26 +69,26 @@ del(src) /obj/effect/mine/dnascramble - name = "Radiation Mine" + name = "radiation mine" icon_state = "uglymine" triggerproc = "triggerrad" /obj/effect/mine/plasma - name = "Plasma Mine" + name = "plasma mine" icon_state = "uglymine" triggerproc = "triggerplasma" /obj/effect/mine/kick - name = "Kick Mine" + name = "kick mine" icon_state = "uglymine" triggerproc = "triggerkick" /obj/effect/mine/n2o - name = "N2O Mine" + name = "\improper N2O mine" icon_state = "uglymine" triggerproc = "triggern2o" /obj/effect/mine/stun - name = "Stun Mine" + name = "stun mine" icon_state = "uglymine" triggerproc = "triggerstun" \ No newline at end of file From 225a906eda72b52f1aee214568bb1da953b5636c Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Wed, 20 Nov 2013 19:15:00 +0100 Subject: [PATCH 2/2] code/game/objects/items/* (root) lowercase pass code/game/objects/items/devices/* lowercase pass --- code/game/objects/items/apc_frame.dm | 2 +- code/game/objects/items/blueprints.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/game/objects/items/devices/PDA/cart.dm | 42 +++++++++---------- code/game/objects/items/devices/PDA/radio.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 1 + .../objects/items/devices/lightreplacer.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 32 +++++++------- .../objects/items/devices/radio/headset.dm | 12 +++--- code/game/objects/items/devices/scanners.dm | 4 +- code/game/objects/items/devices/uplinks.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/toys.dm | 22 +++++----- code/game/objects/items/trash.dm | 2 +- 15 files changed, 66 insertions(+), 65 deletions(-) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 4ed920fd12e..658f7673e0b 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -1,7 +1,7 @@ // APC HULL /obj/item/apc_frame - name = "APC frame" + name = "\improper APC frame" desc = "Used for repairing or building APCs" icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index cfd082ceadf..792b13ae9e6 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -1,5 +1,5 @@ /obj/item/blueprints - name = "station blueprints" + name = "\proper the station blueprints" desc = "Blueprints of the station. There's stamp \"Classified\" and several coffee stains on it." icon = 'icons/obj/items.dmi' icon_state = "blueprints" diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 288bdcbc62e..8ba2e3f6d59 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -133,7 +133,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/syndicate default_cartridge = /obj/item/weapon/cartridge/syndicate icon_state = "pda-syndi" - name = "Military PDA" + name = "military PDA" owner = "John Doe" hidden = 1 diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index ea7f3fb0c6f..7e657c718ca 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -34,27 +34,27 @@ var/list/stored_data = list() engineering - name = "Power-ON Cartridge" + name = "\improper Power-ON cartridge" icon_state = "cart-e" access_engine = 1 atmos - name = "BreatheDeep Cartridge" + name = "\improper BreatheDeep cartridge" icon_state = "cart-a" access_atmos = 1 medical - name = "Med-U Cartridge" + name = "\improper Med-U cartridge" icon_state = "cart-m" access_medical = 1 chemistry - name = "ChemWhiz Cartridge" + name = "\improper ChemWhiz cartridge" icon_state = "cart-chem" access_reagent_scanner = 1 security - name = "R.O.B.U.S.T. Cartridge" + name = "\improper R.O.B.U.S.T. cartridge" icon_state = "cart-s" access_security = 1 @@ -63,7 +63,7 @@ radio = new /obj/item/radio/integrated/beepsky(src) detective - name = "D.E.T.E.C.T. Cartridge" + name = "\improper D.E.T.E.C.T. cartridge" icon_state = "cart-s" access_security = 1 access_medical = 1 @@ -74,30 +74,30 @@ radio = new /obj/item/radio/integrated/beepsky(src) janitor - name = "CustodiPRO Cartridge" + name = "\improper CustodiPRO cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" access_janitor = 1 lawyer - name = "P.R.O.V.E. Cartridge" + name = "\improper P.R.O.V.E. cartridge" icon_state = "cart-s" access_security = 1 clown - name = "Honkworks 5.0" + name = "\improper Honkworks 5.0 cartridge" icon_state = "cart-clown" access_clown = 1 var/honk_charges = 5 mime - name = "Gestur-O 1000" + name = "\improper Gestur-O 1000 cartridge" icon_state = "cart-mi" access_mime = 1 var/mime_charges = 5 /* botanist - name = "Green Thumb v4.20" + name = "\improper Green Thumb v4.20 cartridge" icon_state = "cart-b" access_flora = 1 */ @@ -107,7 +107,7 @@ desc = "A data cartridge with an integrated radio signaler module." toxins - name = "Signal Ace 2" + name = "\improper Signal Ace 2 cartridge" desc = "Complete with integrated radio signaler!" icon_state = "cart-tox" access_reagent_scanner = 1 @@ -120,7 +120,7 @@ quartermaster - name = "Space Parts & Space Vendors Cartridge" + name = "space parts & space vendors cartridge" desc = "Perfect for the Quartermaster on the go!" icon_state = "cart-q" access_quartermaster = 1 @@ -130,13 +130,13 @@ radio = new /obj/item/radio/integrated/mule(src) head - name = "Easy-Record DELUXE" + name = "\improper Easy-Record DELUXE cartridge" icon_state = "cart-h" access_manifest = 1 access_status_display = 1 hop - name = "HumanResources9001" + name = "\improper HumanResources9001 cartridge" icon_state = "cart-h" access_manifest = 1 access_status_display = 1 @@ -149,7 +149,7 @@ radio = new /obj/item/radio/integrated/mule(src) hos - name = "R.O.B.U.S.T. DELUXE" + name = "\improper R.O.B.U.S.T. DELUXE cartridge" icon_state = "cart-hos" access_manifest = 1 access_status_display = 1 @@ -160,7 +160,7 @@ radio = new /obj/item/radio/integrated/beepsky(src) ce - name = "Power-On DELUXE" + name = "\improper Power-On DELUXE cartridge" icon_state = "cart-ce" access_manifest = 1 access_status_display = 1 @@ -168,7 +168,7 @@ access_atmos = 1 cmo - name = "Med-U DELUXE" + name = "\improper Med-U DELUXE cartridge" icon_state = "cart-cmo" access_manifest = 1 access_status_display = 1 @@ -176,7 +176,7 @@ access_medical = 1 rd - name = "Signal Ace DELUXE" + name = "\improper Signal Ace DELUXE cartridge" icon_state = "cart-rd" access_manifest = 1 access_status_display = 1 @@ -188,7 +188,7 @@ radio = new /obj/item/radio/integrated/signal(src) captain - name = "Value-PAK Cartridge" + name = "\improper Value-PAK cartridge" desc = "Now with 200% more value!" icon_state = "cart-c" access_manifest = 1 @@ -204,7 +204,7 @@ radio = new /obj/item/radio/integrated/beepsky(src) syndicate - name = "Detomatix Cartridge" + name = "\improper Detomatix cartridge" icon_state = "cart" access_remote_door = 1 remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 45bcff1c052..eadb043dd79 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -1,5 +1,5 @@ /obj/item/radio/integrated - name = "PDA radio module" + name = "\improper PDA radio module" desc = "An electronic radio system of nanotrasen origin." icon = 'icons/obj/module.dmi' icon_state = "power_mod" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 50a6f44bbc4..732541f6d3d 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -198,6 +198,7 @@ /obj/item/device/flashlight/slime + gender = PLURAL name = "glowing slime extract" desc = "Extract from a yellow slime. It emits a strong light when squeezed." icon = 'icons/obj/lighting.dmi' diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 15dfc43a7db..83923a5c9dd 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -181,7 +181,7 @@ emagged = !emagged playsound(src.loc, "sparks", 100, 1) if(emagged) - name = "Shortcircuited [initial(name)]" + name = "shortcircuited [initial(name)]" else name = initial(name) update_icon() diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 9eaed768a8b..853890021fa 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -1,5 +1,5 @@ /obj/item/device/radio/beacon - name = "Tracking Beacon" + name = "tracking beacon" desc = "A beacon used by a teleporter." icon_state = "beacon" item_state = "signaler" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 5016ad369e9..8a92d36b64d 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -1,6 +1,6 @@ /obj/item/device/encryptionkey/ - name = "Standard Encryption Key" + name = "standard encryption key" desc = "An encryption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN." icon = 'icons/obj/radio.dmi' icon_state = "cypherkey" @@ -27,91 +27,91 @@ origin_tech = "syndicate=3" /obj/item/device/encryptionkey/headset_sec - name = "Security Radio Encryption Key" + name = "security radio encryption key" desc = "An encryption key for a radio headset. To access the security channel, use :s." icon_state = "sec_cypherkey" channels = list("Security" = 1) /obj/item/device/encryptionkey/headset_eng - name = "Engineering Radio Encryption Key" + name = "engineering radio encryption key" desc = "An encryption key for a radio headset. To access the engineering channel, use :e." icon_state = "eng_cypherkey" channels = list("Engineering" = 1) /obj/item/device/encryptionkey/headset_rob - name = "Robotics Radio Encryption Key" + name = "robotics radio encryption key" desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For research, use :n." icon_state = "rob_cypherkey" channels = list("Science" = 1, "Engineering" = 1) /obj/item/device/encryptionkey/headset_med - name = "Medical Radio Encryption Key" + name = "medical radio encryption key" desc = "An encryption key for a radio headset. To access the medical channel, use :m." icon_state = "med_cypherkey" channels = list("Medical" = 1) /obj/item/device/encryptionkey/headset_sci - name = "Science Radio Encryption Key" + name = "science radio encryption key" desc = "An encryption key for a radio headset. To access the science channel, use :n." icon_state = "sci_cypherkey" channels = list("Science" = 1) /obj/item/device/encryptionkey/headset_medsci - name = "Medical Research Radio Encryption Key" + name = "medical research radio encryption key" desc = "An encryption key for a radio headset. To access the medical channel, use :m. For science, use :n." icon_state = "medsci_cypherkey" channels = list("Science" = 1, "Medical" = 1) /obj/item/device/encryptionkey/headset_com - name = "Command Radio Encryption Key" + name = "command radio encryption key" desc = "An encryption key for a radio headset. To access the command channel, use :c." icon_state = "com_cypherkey" channels = list("Command" = 1) /obj/item/device/encryptionkey/heads/captain - name = "Captain's Encryption Key" + name = "\proper the captain's encryption key" desc = "An encryption key for a radio headset. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science." icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0) /obj/item/device/encryptionkey/heads/rd - name = "Research Director's Encryption Key" + name = "\proper the research director's encryption key" desc = "An encryption key for a radio headset. To access the science channel, use :n. For command, use :c." icon_state = "rd_cypherkey" channels = list("Science" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hos - name = "Head of Security's Encryption Key" + name = "\proper the head of security's encryption key" desc = "An encryption key for a radio headset. To access the security channel, use :s. For command, use :c." icon_state = "hos_cypherkey" channels = list("Security" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/ce - name = "Chief Engineer's Encryption Key" + name = "\proper the chief engineer's encryption key" desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For command, use :c." icon_state = "ce_cypherkey" channels = list("Engineering" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/cmo - name = "Chief Medical Officer's Encryption Key" + name = "\proper the chief medical officer's encryption key" desc = "An encryption key for a radio headset. To access the medical channel, use :m. For command, use :c." icon_state = "cmo_cypherkey" channels = list("Medical" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hop - name = "Head of Personnel's Encryption Key" + name = "\proper the head of personnel's encryption key" desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :v - service, :c - command." icon_state = "hop_cypherkey" channels = list("Supply" = 1, "Service" = 1, "Command" = 1) /obj/item/device/encryptionkey/headset_cargo - name = "Supply Radio Encryption Key" + name = "supply radio encryption key" desc = "An encryption key for a radio headset. To access the supply channel, use :u." icon_state = "cargo_cypherkey" channels = list("Supply" = 1) /obj/item/device/encryptionkey/headset_service - name = "Service Radio Encryption Key" + name = "service radio encryption key" desc = "An encryption key for a radio headset. To access the service channel, use :v." icon_state = "srv_cypherkey" channels = list("Service" = 1) \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index b352cb09ccd..af65fffa1e4 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -99,42 +99,42 @@ keyslot2 = new /obj/item/device/encryptionkey/headset_com /obj/item/device/radio/headset/heads/captain - name = "captain's headset" + name = "\proper the captain's headset" desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/captain /obj/item/device/radio/headset/heads/rd - name = "Research Director's headset" + name = "\proper the research director's headset" desc = "Headset of the fellow who keeps society marching towards technological singularity. To access the science channel, use :n. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/hos - name = "head of security's headset" + name = "\proper the head of security's headset" desc = "The headset of the man in charge of keeping order and protecting the station. To access the security channel, use :s. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/ce - name = "chief engineer's headset" + name = "\proper the chief engineer's headset" desc = "The headset of the guy in charge of keeping the station powered and undamaged. To access the engineering channel, use :e. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/ce /obj/item/device/radio/headset/heads/cmo - name = "chief medical officer's headset" + name = "\proper the chief medical officer's headset" desc = "The headset of the highly trained medical chief. To access the medical channel, use :m. For command, use :c." icon_state = "com_headset" item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/heads/cmo /obj/item/device/radio/headset/heads/hop - name = "head of personnel's headset" + name = "\proper the head of personnel's headset" desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :v - service, :c - command." icon_state = "com_headset" item_state = "headset" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1c08b4ca68b..27b99ccfece 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -9,7 +9,7 @@ MASS SPECTROMETER */ /obj/item/device/t_scanner - name = "T-ray scanner" + name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon_state = "t-ray0" var/on = 0 @@ -61,7 +61,7 @@ MASS SPECTROMETER /obj/item/device/healthanalyzer - name = "Health Analyzer" + name = "health analyzer" icon_state = "health" item_state = "analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 54614d59352..16a29af3098 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -121,7 +121,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid */ /obj/item/device/uplink/hidden - name = "Hidden Uplink." + name = "hidden uplink." desc = "There is something wrong if you're examining this." /obj/item/device/uplink/hidden/Topic(href, href_list) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 6e1c608cb2f..99afec53c3c 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -1,5 +1,5 @@ /obj/item/latexballon - name = "Latex glove" + name = "latex glove" desc = "" //todo icon_state = "latexballon" item_state = "lgloves" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ade5c540ab1..88ca14f1d2e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -97,7 +97,7 @@ * Fake singularity */ /obj/item/toy/spinningtoy - name = "Gravitational Singularity" + name = "gravitational singularity" desc = "\"Singulo\" brand spinning toy." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" @@ -484,26 +484,26 @@ ..() /obj/item/toy/prize/ripley - name = "toy ripley" + name = "toy Ripley" desc = "Mini-Mecha action figure! Collect them all! 1/11." /obj/item/toy/prize/fireripley - name = "toy firefighting ripley" + name = "toy firefighting Ripley" desc = "Mini-Mecha action figure! Collect them all! 2/11." icon_state = "fireripleytoy" /obj/item/toy/prize/deathripley - name = "toy deathsquad ripley" + name = "toy deathsquad Ripley" desc = "Mini-Mecha action figure! Collect them all! 3/11." icon_state = "deathripleytoy" /obj/item/toy/prize/gygax - name = "toy gygax" + name = "toy Gygax" desc = "Mini-Mecha action figure! Collect them all! 4/11." icon_state = "gygaxtoy" /obj/item/toy/prize/durand - name = "toy durand" + name = "toy Durand" desc = "Mini-Mecha action figure! Collect them all! 5/11." icon_state = "durandprize" @@ -513,27 +513,27 @@ icon_state = "honkprize" /obj/item/toy/prize/marauder - name = "toy marauder" + name = "toy Marauder" desc = "Mini-Mecha action figure! Collect them all! 7/11." icon_state = "marauderprize" /obj/item/toy/prize/seraph - name = "toy seraph" + name = "toy Seraph" desc = "Mini-Mecha action figure! Collect them all! 8/11." icon_state = "seraphprize" /obj/item/toy/prize/mauler - name = "toy mauler" + name = "toy Mauler" desc = "Mini-Mecha action figure! Collect them all! 9/11." icon_state = "maulerprize" /obj/item/toy/prize/odysseus - name = "toy odysseus" + name = "toy Odysseus" desc = "Mini-Mecha action figure! Collect them all! 10/11." icon_state = "odysseusprize" /obj/item/toy/prize/phazon - name = "toy phazon" + name = "toy Phazon" desc = "Mini-Mecha action figure! Collect them all! 11/11." icon_state = "phazonprize" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 12b8daee81d..ed69ba9f38a 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -5,7 +5,7 @@ w_class = 1.0 raisins - name = "4no raisins" + name = "\improper 4no raisins" icon_state= "4no_raisins" candy name = "candy"