Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
This commit is contained in:
Certh
2015-12-07 16:14:26 +01:00
parent b8db2dd78d
commit 591daf04d2
92 changed files with 297 additions and 298 deletions
+6 -6
View File
@@ -27,7 +27,7 @@
/obj/item/stack/sheet/animalhide/random
name = "Random animal hide"
name = "random animal hide"
New()
..()
spawn(1)
@@ -80,7 +80,7 @@
name = "unlabelled bottle"
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)
/obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink
name = "unlabelled drink"
icon = 'icons/obj/drinks.dmi'
@@ -96,7 +96,7 @@
icon_state = pick("alco-white","alco-green","alco-blue","alco-clear","alco-red")
pixel_x = rand(-5,5)
pixel_y = rand(-5,5)
/obj/item/weapon/reagent_containers/food/drinks/bottle/random_reagent // Same as the chembottle code except the container
name = "unlabelled drink?"
icon = 'icons/obj/drinks.dmi'
@@ -146,7 +146,7 @@
// -------------------------------------
/obj/structure/closet/crate/secure/unknownchemicals
name = "Grey-market Chemicals Grab Pack"
name = "grey-market chemicals grab pack"
desc = "Crate full of chemicals of unknown type and value from a 'trusted' source."
req_one_access = list(access_chemistry,access_research,access_qm) // the qm knows a guy, you see.
@@ -172,7 +172,7 @@
return
/obj/structure/closet/crate/secure/chemicals
name = "Chemical Supply Kit"
name = "chemical supply kit"
desc = "Full of basic chemistry supplies."
req_one_access = list(access_chemistry,access_research)
@@ -229,7 +229,7 @@
*/
/obj/structure/closet/secure_closet/random_drinks
name = "Unlabelled Booze"
name = "unlabelled booze closet"
req_access = list(access_bar)
icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective"
+5 -5
View File
@@ -17,7 +17,7 @@
var/lit = 0
/obj/item/weapon/lighter/zippo
name = "Zippo lighter"
name = "zippo lighter"
desc = "The zippo."
icon_state = "zippo"
item_state = "zippo"
@@ -101,7 +101,7 @@
icon_state = "zippo_nt_off"
icon_on = "zippo_nt_on"
icon_off = "zippo_nt_off"
/obj/item/weapon/lighter/zippo/blue
name = "blue zippo lighter"
desc = "A zippo lighter made of some blue metal."
@@ -109,20 +109,20 @@
icon_on = "bluezippoon"
icon_off = "bluezippo"
/obj/item/weapon/lighter/zippo/black
/obj/item/weapon/lighter/zippo/black
name = "black zippo lighter"
desc = "A black zippo lighter."
icon_state = "blackzippo"
icon_on = "blackzippoon"
icon_off = "blackzippo"
/obj/item/weapon/lighter/zippo/engraved
/obj/item/weapon/lighter/zippo/engraved
name = "engraved zippo lighter"
desc = "A intricately engraved zippo lighter."
icon_state = "engravedzippo"
icon_on = "engravedzippoon"
icon_off = "engravedzippo"
/obj/item/weapon/lighter/zippo/gonzofist
name = "Gonzo Fist zippo"
desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
@@ -1,6 +1,6 @@
//I still dont think this should be a closet but whatever
/obj/structure/closet/fireaxecabinet
name = "Fire Axe Cabinet"
name = "fire axe cabinet"
desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
var/obj/item/weapon/twohanded/fireaxe/fireaxe = new/obj/item/weapon/twohanded/fireaxe
icon_state = "fireaxe1000"
@@ -120,7 +120,7 @@
//Paramedic
/obj/structure/closet/paramedic
name = "Paramedic Wardrobe"
name = "paramedic wardrobe"
desc = "It's a storage unit for paramedic equipment."
icon_state = "blue"
icon_closed = "blue"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/bar
name = "Booze"
name = "Booze cabinet"
req_access = list(access_bar)
icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/cargotech
name = "Cargo Technician's Locker"
name = "cargo technician's locker"
req_access = list(access_cargo)
icon_state = "securecargo1"
icon_closed = "securecargo"
@@ -20,7 +20,7 @@
return
/obj/structure/closet/secure_closet/quartermaster
name = "Quartermaster's Locker"
name = "quartermaster's locker"
req_access = list(access_qm)
icon_state = "secureqm1"
icon_closed = "secureqm"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "Chief Engineer's Locker"
name = "chief engineer's locker"
req_access = list(access_ce)
icon_state = "securece1"
icon_closed = "securece"
@@ -35,7 +35,7 @@
return
/obj/structure/closet/secure_closet/engineering_electrical
name = "Electrical Supplies"
name = "electrical supplies locker"
req_access = list(access_engine_equip)
icon_state = "secureengelec1"
icon_closed = "secureengelec"
@@ -65,7 +65,7 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "Welding Supplies"
name = "welding supplies locker"
req_access = list(access_engine_equip)
icon_state = "secureengweld1"
icon_closed = "secureengweld"
@@ -89,7 +89,7 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "Engineer's Locker"
name = "engineer's locker"
req_access = list(access_engine_equip)
icon_state = "secureeng1"
icon_closed = "secureeng"
@@ -119,7 +119,7 @@
return
/obj/structure/closet/secure_closet/atmos_personal
name = "Technician's Locker"
name = "technician's locker"
req_access = list(access_atmospherics)
icon_state = "secureeng1"
icon_closed = "secureeng"
@@ -24,7 +24,7 @@
return
/obj/structure/closet/secure_closet/freezer/kitchen
name = "Kitchen Cabinet"
name = "kitchen cabinet"
req_access = list(access_kitchen)
New()
@@ -43,7 +43,7 @@
/obj/structure/closet/secure_closet/freezer/meat
name = "Meat Fridge"
name = "meat fridge"
icon_state = "fridge1"
icon_closed = "fridge"
icon_locked = "fridge1"
@@ -62,7 +62,7 @@
/obj/structure/closet/secure_closet/freezer/fridge
name = "Refrigerator"
name = "refrigerator"
icon_state = "fridge1"
icon_closed = "fridge"
icon_locked = "fridge1"
@@ -85,7 +85,7 @@
/obj/structure/closet/secure_closet/freezer/money
name = "Freezer"
name = "freezer"
icon_state = "fridge1"
icon_closed = "fridge"
icon_locked = "fridge1"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/hydroponics
name = "Botanist's locker"
name = "botanist's locker"
req_access = list(access_hydroponics)
icon_state = "hydrosecure1"
icon_closed = "hydrosecure"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/medical1
name = "Medicine Closet"
name = "medicine closet"
desc = "Filled with medical junk."
icon_state = "medical1"
icon_closed = "medical"
@@ -28,7 +28,7 @@
/obj/structure/closet/secure_closet/medical2
name = "Anesthetic"
name = "anesthetic locker"
desc = "Used to knock people out."
icon_state = "medical1"
icon_closed = "medical"
@@ -53,7 +53,7 @@
/obj/structure/closet/secure_closet/medical3
name = "Medical Doctor's Locker"
name = "medical doctor's locker"
req_access = list(access_surgery)
icon_state = "securemed1"
icon_closed = "securemed"
@@ -82,7 +82,7 @@
//Exam Room
/obj/structure/closet/secure_closet/exam
name = "Exam Room Closet"
name = "exam room closet"
desc = "Filled with exam room materials."
icon_state = "medical1"
icon_closed = "medical"
@@ -126,7 +126,7 @@
new /obj/item/weapon/reagent_containers/pill/methamphetamine(src)
/obj/structure/closet/secure_closet/psychiatrist
name = "Psychiatrist's Locker"
name = "psychiatrist's locker"
req_access = list(access_psychiatrist)
icon_state = "securemed1"
icon_closed = "securemed"
@@ -146,7 +146,7 @@
return
/obj/structure/closet/secure_closet/CMO
name = "Chief Medical Officer's Locker"
name = "chief medical officer's locker"
req_access = list(access_cmo)
icon_state = "cmosecure1"
icon_closed = "cmosecure"
@@ -190,7 +190,7 @@
/obj/structure/closet/secure_closet/animal
name = "Animal Control"
name = "animal control locker"
req_access = list(access_surgery)
@@ -206,7 +206,7 @@
/obj/structure/closet/secure_closet/chemical
name = "Chemical Closet"
name = "chemical closet"
desc = "Store dangerous chemicals in here."
icon_state = "medical1"
icon_closed = "medical"
@@ -225,7 +225,7 @@
return
/obj/structure/closet/secure_closet/medical_wall
name = "First Aid Closet"
name = "first aid closet"
desc = "It's a secure wall-mounted storage unit for first aid supplies."
icon_state = "medical_wall_locked"
icon_closed = "medical_wall_unlocked"
@@ -251,7 +251,7 @@
icon_state = icon_opened
/obj/structure/closet/secure_closet/paramedic
name = "Paramedic EVA gear"
name = "paramedic EVA gear"
desc = "A locker with a Paramedic EVA suit."
icon_state = "medical1"
icon_closed = "medical"
@@ -272,7 +272,7 @@
return
/obj/structure/closet/secure_closet/reagents
name = "Chemical Storage Closet"
name = "chemical storage closet"
desc = "Store dangerous chemicals in here."
icon_state = "chemical1"
icon_closed = "chemical"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/scientist
name = "Scientist's Locker"
name = "scientist's locker"
req_access = list(access_tox_storage)
icon_state = "secureres1"
icon_closed = "secureres"
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/RD
name = "Research Director's Locker"
name = "research director's locker"
req_access = list(access_rd)
icon_state = "rdsecure1"
icon_closed = "rdsecure"
@@ -53,7 +53,7 @@
return
/obj/structure/closet/secure_closet/research_reagents
name = "Research Chemical Storage Closet"
name = "research chemical storage closet"
desc = "Store dangerous chemicals in here."
icon_state = "rchemical1"
icon_closed = "rchemical"
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/captains
name = "Captain's Locker"
name = "captain's locker"
req_access = list(access_captain)
icon_state = "capsecure1"
icon_closed = "capsecure"
@@ -32,7 +32,7 @@
/obj/structure/closet/secure_closet/hop
name = "Head of Personnel's Locker"
name = "head of personnel's locker"
req_access = list(access_hop)
icon_state = "hopsecure1"
icon_closed = "hopsecure"
@@ -58,7 +58,7 @@
return
/obj/structure/closet/secure_closet/hop2
name = "Head of Personnel's Attire"
name = "head of personnel's attire"
req_access = list(access_hop)
icon_state = "hopsecure1"
icon_closed = "hopsecure"
@@ -87,7 +87,7 @@
/obj/structure/closet/secure_closet/hos
name = "Head of Security's Locker"
name = "head of security's locker"
req_access = list(access_hos)
icon_state = "hossecure1"
icon_closed = "hossecure"
@@ -126,7 +126,7 @@
/obj/structure/closet/secure_closet/warden
name = "Warden's Locker"
name = "warden's locker"
req_access = list(access_armory)
icon_state = "wardensecure1"
icon_closed = "wardensecure"
@@ -166,7 +166,7 @@
/obj/structure/closet/secure_closet/security
name = "Security Officer's Locker"
name = "security officer's locker"
req_access = list(access_security)
icon_state = "sec1"
icon_closed = "sec"
@@ -197,7 +197,7 @@
return
/obj/structure/closet/secure_closet/brigdoc
name = "Brig Physician's Locker"
name = "brig physician's locker"
req_access = list(access_security)
icon_state = "securemed1"
icon_closed = "securemed"
@@ -227,7 +227,7 @@
return
/obj/structure/closet/secure_closet/blueshield
name = "Blueshield's Locker"
name = "blueshield's locker"
req_access = list(access_blueshield)
icon_state = "bssecure1"
icon_closed = "bssecure"
@@ -258,7 +258,7 @@
return
/obj/structure/closet/secure_closet/ntrep
name = "Nanotrasen Representative's Locker"
name = "\improper Nanotrasen Representative's locker"
req_access = list(access_ntrep)
icon_state = "ntsecure1"
icon_closed = "ntsecure"
@@ -317,7 +317,7 @@
/obj/structure/closet/secure_closet/detective
name = "Detective's Cabinet"
name = "detective's cabinet"
req_access = list(access_forensics_lockers)
icon_state = "cabinetdetective_locked"
icon_closed = "cabinetdetective"
@@ -361,7 +361,7 @@
icon_state = icon_opened
/obj/structure/closet/secure_closet/injection
name = "Lethal Injections"
name = "lethal injections locker"
req_access = list(access_captain)
@@ -375,7 +375,7 @@
/obj/structure/closet/secure_closet/brig
name = "Brig Locker"
name = "brig locker"
req_access = list(access_brig)
anchored = 1
var/id = null
@@ -388,7 +388,7 @@
/obj/structure/closet/secure_closet/courtroom
name = "Courtroom Locker"
name = "courtroom locker"
req_access = list(access_court)
New()
@@ -347,14 +347,14 @@
/obj/structure/closet/crate/internals
desc = "A internals crate."
name = "Internals crate"
name = "internals crate"
icon_state = "o2crate"
icon_opened = "o2crateopen"
icon_closed = "o2crate"
/obj/structure/closet/crate/trashcart
desc = "A heavy, metal trashcart with wheels."
name = "Trash Cart"
name = "trash Cart"
icon_state = "trashcart"
icon_opened = "trashcartopen"
icon_closed = "trashcart"
@@ -377,14 +377,14 @@
/obj/structure/closet/crate/medical
desc = "A medical crate."
name = "Medical crate"
name = "medical crate"
icon_state = "medicalcrate"
icon_opened = "medicalcrateopen"
icon_closed = "medicalcrate"
/obj/structure/closet/crate/rcd
desc = "A crate for the storage of the RCD."
name = "RCD crate"
name = "\improper RCD crate"
icon_state = "crate"
icon_opened = "crateopen"
icon_closed = "crate"
@@ -426,14 +426,14 @@
/obj/structure/closet/crate/bin
desc = "A large bin."
name = "Large bin"
name = "large bin"
icon_state = "largebin"
icon_opened = "largebinopen"
icon_closed = "largebin"
/obj/structure/closet/crate/radiation
desc = "A crate with a radiation sign on it."
name = "Radioactive gear crate"
name = "radioactive gear crate"
icon_state = "radiation"
icon_opened = "radiationopen"
icon_closed = "radiation"
@@ -451,21 +451,21 @@
/obj/structure/closet/crate/secure/weapon
desc = "A secure weapons crate."
name = "Weapons crate"
name = "weapons crate"
icon_state = "weaponcrate"
icon_opened = "weaponcrateopen"
icon_closed = "weaponcrate"
/obj/structure/closet/crate/secure/plasma
desc = "A secure plasma crate."
name = "Plasma crate"
name = "plasma crate"
icon_state = "plasmacrate"
icon_opened = "plasmacrateopen"
icon_closed = "plasmacrate"
/obj/structure/closet/crate/secure/gear
desc = "A secure gear crate."
name = "Gear crate"
name = "gear crate"
icon_state = "secgearcrate"
icon_opened = "secgearcrateopen"
icon_closed = "secgearcrate"
@@ -479,7 +479,7 @@
/obj/structure/closet/crate/secure/bin
desc = "A secure bin."
name = "Secure bin"
name = "secure bin"
icon_state = "largebins"
icon_opened = "largebinsopen"
icon_closed = "largebins"
@@ -550,7 +550,7 @@
icon_closed = "largermetal"
/obj/structure/closet/crate/hydroponics
name = "Hydroponics crate"
name = "hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
icon_state = "hydrocrate"
icon_opened = "hydrocrateopen"
@@ -92,5 +92,5 @@
amount = 50
/obj/structure/closet/critter/deer
name = "Deer crate"
name = "deer crate"
content_mob = /mob/living/simple_animal/deer
@@ -3,7 +3,7 @@
/obj/structure/closet/walllocker
desc = "A wall mounted storage locker."
name = "Wall Locker"
name = "wall locker"
icon = 'icons/obj/walllocker.dmi'
icon_state = "wall-locker"
density = 0
+2 -2
View File
@@ -192,7 +192,7 @@
/obj/structure/flora/kirbyplants
name = "Potted plant"
name = "potted plant"
icon = 'icons/obj/flora/plants.dmi'
icon_state = "plant-1"
anchored = 0
@@ -205,7 +205,7 @@
icon_state = "plant-36"
/obj/structure/flora/kirbyplants/dead
name = "RD's potted plant"
name = "/improper RD's potted plant"
desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
icon_state = "plant-dead"