From fcb2fb9de39c7447df935093e542a335d65b7da9 Mon Sep 17 00:00:00 2001 From: KyrahAbattoir Date: Sat, 26 Jul 2014 17:36:37 +0200 Subject: [PATCH] Another lowercasing pass on a bunch of items and furnitures. Synthflesh should be a plural. Leg cuffs is better than legcuffs. LaserTag -> laser tag is not a brand name. centcom -> Centcom is always capitalised. --- code/datums/supplypacks.dm | 6 +++--- code/defines/obj.dm | 4 ++-- code/defines/obj/weapon.dm | 5 +++-- code/game/gamemodes/cult/cult_items.dm | 2 +- code/game/gamemodes/cult/cult_structures.dm | 8 ++++---- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- code/game/gamemodes/nuclear/pinpointer.dm | 2 +- code/game/objects/items/devices/radio/headset.dm | 2 +- code/modules/admin/verbs/debug.dm | 8 ++++---- code/modules/clothing/head/helmet.dm | 4 ++-- code/modules/library/lib_machines.dm | 8 ++++---- code/modules/mining/laborcamp/laborshuttle.dm | 4 ++-- code/modules/mining/laborcamp/laborstacker.dm | 4 ++-- code/modules/mining/satchel_ore_boxdm.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- 15 files changed, 32 insertions(+), 31 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 59dede1d138..85f57ba6f3a 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -899,7 +899,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containername = "water tank crate" /datum/supply_packs/misc/lasertag - name = "LaserTag Crate" + name = "Laser Tag Crate" contains = list(/obj/item/weapon/gun/energy/laser/redtag, /obj/item/weapon/gun/energy/laser/redtag, /obj/item/weapon/gun/energy/laser/redtag, @@ -915,7 +915,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/head/helmet/redtaghelm, /obj/item/clothing/head/helmet/bluetaghelm) cost = 15 - containername = "LaserTag Crate" + containername = "laser tag crate" /datum/supply_packs/misc/religious_supplies name = "Religious Supplies Crate" @@ -1064,7 +1064,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/head/collectable/petehat) name = "Collectable hat crate!" cost = 200 - containername = "Collectable hats crate! Brought to you by Bass.inc!" + containername = "collectable hats crate! Brought to you by Bass.inc!" /datum/supply_packs/misc/randomised/New() manifest += "Contains any [num_contained] of:" diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 989b16c800a..df96df6c76b 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -50,13 +50,13 @@ unacidable = 1//temporary until I decide whether the borg can be removed. -veyveyr /obj/structure/showcase/fakeid - name = "Centcom Identification Console" + name = "\improper Centcom identification console" desc = "You can use this to change ID's." icon = 'icons/obj/computer.dmi' icon_state = "id" /obj/structure/showcase/fakesec - name = "Centcom Security Records" + name = "\improper Centcom security records" desc = "Used to view and edit personnel's security records" icon = 'icons/obj/computer.dmi' icon_state = "security" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 4b168a95915..28f806a74d6 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -95,7 +95,7 @@ icon = 'icons/obj/items.dmi' /obj/item/weapon/legcuffs - name = "legcuffs" + name = "leg cuffs" desc = "Use this to keep prisoners in line." gender = PLURAL icon = 'icons/obj/items.dmi' @@ -282,6 +282,7 @@ /obj/item/weapon/syntiflesh name = "syntiflesh" desc = "Meat that appears...strange..." + gender = PLURAL icon = 'icons/obj/food.dmi' icon_state = "meat" flags = CONDUCT @@ -342,7 +343,7 @@ ///////////////////////////////////////Stock Parts ///////////////////////////////// /obj/item/weapon/storage/part_replacer - name = "Rapid Part Exchange Device" + name = "rapid part exchange device" desc = "Special mechanical module made to store, sort, and apply standard machine parts." icon_state = "RPED" item_state = "RPED" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 903732b6d17..37df1fa8581 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -1,5 +1,5 @@ /obj/item/weapon/melee/cultblade - name = "Cult Blade" + name = "cult blade" desc = "An arcane weapon wielded by the followers of Nar-Sie" icon_state = "cultblade" item_state = "cultblade" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 131e1640714..01bab649c0c 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -4,24 +4,24 @@ icon = 'icons/obj/cult.dmi' /obj/structure/cult/talisman - name = "Altar" + name = "altar" desc = "A bloodstained altar dedicated to Nar-Sie" icon_state = "talismanaltar" /obj/structure/cult/forge - name = "Daemon forge" + name = "daemon forge" desc = "A forge used in crafting the unholy weapons used by the armies of Nar-Sie" icon_state = "forge" /obj/structure/cult/pylon - name = "Pylon" + name = "pylon" desc = "A floating crystal that hums with an unearthly energy" icon_state = "pylon" luminosity = 5 /obj/structure/cult/tome - name = "Desk" + name = "desk" desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl" icon_state = "tomealtar" // luminosity = 5 diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index df835cbfda0..9f79aa9de4d 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -1,7 +1,7 @@ var/bomb_set /obj/machinery/nuclearbomb - name = "\improper Nuclear Fission Explosive" + name = "nuclear fission explosive" desc = "Uh oh. RUN!!!!" icon = 'icons/obj/stationobjs.dmi' icon_state = "nuclearbomb0" diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 6f1413fb71c..c6c34c9beb0 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -62,7 +62,7 @@ /obj/item/weapon/pinpointer/advpinpointer - name = "Advanced Pinpointer" + name = "advanced pinpointer" icon = 'icons/obj/device.dmi' desc = "A larger version of the normal pinpointer, this unit features a helpful quantum entanglement detection system to locate various objects that do not broadcast a locator signal." var/mode = 0 // Mode 0 locates disk, mode 1 locates coordinates. diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 463f17caf6d..d6a1e53c4c5 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -155,7 +155,7 @@ keyslot2 = new /obj/item/device/encryptionkey/headset_service /obj/item/device/radio/headset/headset_cent - name = "centcom headset" + name = "\improper Centcom headset" desc = "A headset used by the upper echelons of Nanotrasen. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science." icon_state = "cent_headset" item_state = "headset" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 832fe3a43f1..754ec1591b0 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -626,8 +626,8 @@ var/global/list/g_fancy_list_of_safe_types = null "tournament gangster", "tournament chef", "tournament janitor", - "lasertag red", - "lasertag blue", + "laser tag red", + "laser tag blue", "pirate", "space pirate", "soviet admiral", @@ -739,7 +739,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - if ("lasertag red") + if ("laser tag red") M.equip_to_slot_or_del(new /obj/item/clothing/under/color/red(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/red(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/red(M), slot_gloves) @@ -750,7 +750,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/laser/redtag(M), slot_s_store) - if ("lasertag blue") + if ("laser tag blue") M.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/blue(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/blue(M), slot_gloves) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 4eae487d02b..1e4e6b2dee7 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -86,7 +86,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES obj/item/clothing/head/helmet/redtaghelm - name = "Red LaserTag Helmet" + name = "red laser tag helmet" desc = "They have chosen their own end." icon_state = "redtaghelm" flags = HEADCOVERSEYES @@ -96,7 +96,7 @@ obj/item/clothing/head/helmet/redtaghelm flags_inv = HIDEEARS|HIDEEYES obj/item/clothing/head/helmet/bluetaghelm - name = "Blue LaserTag Helmet" + name = "blue laser tag helmet" desc = "They'll need more men." icon_state = "bluetaghelm" flags = HEADCOVERSEYES diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 61abae5d23a..19559ac0523 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -21,7 +21,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f * Library Public Computer */ /obj/machinery/librarypubliccomp - name = "Library Visitor Console" + name = "library visitor console" icon = 'icons/obj/library.dmi' icon_state = "computer" anchored = 1 @@ -119,7 +119,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f // TODO: Make this an actual /obj/machinery/computer that can be crafted from circuit boards and such // It is August 22nd, 2012... This TODO has already been here for months.. I wonder how long it'll last before someone does something about it. /obj/machinery/librarycomp - name = "Book Inventory Management Console" + name = "book inventory management console" icon = 'icons/obj/library.dmi' icon_state = "computer" anchored = 1 @@ -399,7 +399,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f * Library Scanner */ /obj/machinery/libraryscanner - name = "Scanner Control Interface" + name = "scanner control interface" icon = 'icons/obj/library.dmi' icon_state = "bigscanner" anchored = 1 @@ -454,7 +454,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f * Book binder */ /obj/machinery/bookbinder - name = "Book Binder" + name = "book binder" icon = 'icons/obj/library.dmi' icon_state = "binder" anchored = 1 diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 535edbb899d..d0fce36e488 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/shuttle/labor - name = "Labor Shuttle Console" + name = "labor shuttle console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" circuit = /obj/item/weapon/circuitboard/labor_shuttle @@ -8,7 +8,7 @@ /obj/machinery/computer/shuttle/labor/one_way - name = "Prisoner Shuttle Console" + name = "prisoner shuttle console" desc = "A one-way shuttle console, used to summon the shuttle to the labor camp." circuit = /obj/item/weapon/circuitboard/labor_shuttle/one_way req_access = list( ) diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 13195eff487..334d71311e5 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -1,7 +1,7 @@ /**********************Prisoners' Console**************************/ /obj/machinery/mineral/labor_claim_console - name = "Point Claim Console" + name = "point claim console" desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners." name = "stacking machine console" icon = 'icons/obj/machines/mining_machines.dmi' @@ -34,7 +34,7 @@ /obj/machinery/mineral/labor_claim_console/attack_hand(user as mob) - name = "Point Claim Console" + name = "point claim console" icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "console" desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners." diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index d2ff9f1e18e..1bba0dfd42f 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -4,7 +4,7 @@ /obj/structure/ore_box icon = 'icons/obj/mining.dmi' icon_state = "orebox" - name = "Ore Box" + name = "ore box" desc = "It's heavy" density = 1 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index c6cf2abb843..276a3b8d0de 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -58,7 +58,7 @@ /obj/item/projectile/lasertag - name = "lasertag beam" + name = "laser tag beam" icon_state = "omnilaser" hitsound = null damage = 0