From 6e873faf1fe98667b7159de2f78b447217c8135b Mon Sep 17 00:00:00 2001 From: Tenebrosity Date: Sun, 26 May 2013 18:16:02 +1200 Subject: [PATCH 1/2] * Edited encryptionkey.dm: Fixes about nineteen typos * Edited tools.dm: Fixes "screwwy" typo in screwdriver description * Edited paper.dm: Updates DJ station instruction sheet in light of the removal of the broadcaster and receiver from the DJ station * Edited lib_items.dm: Fixes typo in "unwrenched" in a bookshelf deconstruction step * Edited tgstation.2.1.2.dmm: Adds updated DJ station sheet to DJ station, replaces missing disposal pipe underneath HoP office door. * Edited utility_closets.dm: Fixed oxygen closet description * Edited DJ station paper to read better --- code/game/machinery/computer/arcade.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 38 +++++++++---------- code/game/objects/items/weapons/tools.dm | 2 +- .../crates_lockers/closets/utility_closets.dm | 2 +- code/modules/library/lib_items.dm | 2 +- code/modules/paperwork/paper.dm | 6 +-- maps/tgstation.2.1.2.dmm | 4 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index f99404b6636..07eb9b67622 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/arcade name = "arcade machine" - desc = "Does not support Pin ball." + desc = "Does not support Pinball." icon = 'icons/obj/computer.dmi' icon_state = "arcade" circuit = "/obj/item/weapon/circuitboard/arcade" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index fde473ff016..2c9e36c0b79 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -1,7 +1,7 @@ /obj/item/device/encryptionkey/ - name = "Standard Encrpytion Key" - desc = "An encyption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN." + 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" w_class = 1 @@ -28,102 +28,102 @@ /obj/item/device/encryptionkey/headset_sec name = "Security Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "sec_cypherkey" channels = list("Security" = 1) /obj/item/device/encryptionkey/headset_eng name = "Engineering Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "eng_cypherkey" channels = list("Engineering" = 1) /obj/item/device/encryptionkey/headset_rob name = "Robotics Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "rob_cypherkey" channels = list("Engineering" = 1, "Science" = 1) /obj/item/device/encryptionkey/headset_med name = "Medical Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "med_cypherkey" channels = list("Medical" = 1) /obj/item/device/encryptionkey/headset_sci name = "Science Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "sci_cypherkey" channels = list("Science" = 1) /obj/item/device/encryptionkey/headset_medsci name = "Medical Research Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "medsci_cypherkey" channels = list("Medical" = 1, "Science" = 1) /obj/item/device/encryptionkey/headset_com name = "Command Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "com_cypherkey" channels = list("Command" = 1) /obj/item/device/encryptionkey/heads/captain name = "Captain's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." 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" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "rd_cypherkey" channels = list("Science" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hos name = "Head of Security's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "hos_cypherkey" channels = list("Security" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/ce name = "Chief Engineer's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "ce_cypherkey" channels = list("Engineering" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/cmo name = "Chief Medical Officer's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "cmo_cypherkey" channels = list("Medical" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hop name = "Head of Personnel's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "hop_cypherkey" channels = list("Supply" = 1, "Command" = 1, "Service" = 1, "Security" = 0) /* /obj/item/device/encryptionkey/headset_mine name = "Mining Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "mine_cypherkey" channels = list("Mining" = 1) /obj/item/device/encryptionkey/heads/qm name = "Quartermaster's Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "qm_cypherkey" channels = list("Cargo" = 1, "Mining" = 1) */ /obj/item/device/encryptionkey/headset_cargo name = "Supply Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "cargo_cypherkey" channels = list("Supply" = 1) /obj/item/device/encryptionkey/headset_service name = "Service Radio Encryption Key" - desc = "An encyption key for a radio headset. Contains cypherkeys." + desc = "An encryption key for a radio headset. Contains cypherkeys." icon_state = "srv_cypherkey" channels = list("Service" = 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index f7873ac95d9..b32a5e25eb8 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -34,7 +34,7 @@ */ /obj/item/weapon/screwdriver name = "screwdriver" - desc = "You can be totally screwwy with this." + desc = "You can be totally screwy with this." icon = 'icons/obj/items.dmi' icon_state = "screwdriver" flags = FPRINT | TABLEPASS| CONDUCT diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index adac90b75bf..a9100809153 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -14,7 +14,7 @@ */ /obj/structure/closet/emcloset name = "emergency closet" - desc = "It's a storage unit for emergency breathmasks and o2 tanks." + desc = "It's a storage unit for emergency breath masks and O2 tanks." icon_state = "emergency" icon_closed = "emergency" icon_opened = "emergencyopen" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index c844b3edb38..e3b03bad0cb 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -55,7 +55,7 @@ icon_state = "book-0" if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "You unrwench the frame." + user << "You unwrench the frame." anchored = 0 state = 0 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c97fa96e0fe..e483e0895ea 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -277,12 +277,12 @@ else if(istype(P, /obj/item/weapon/stamp)) if(!in_range(src, usr) && loc != user && !istype(loc, /obj/item/weapon/clipboard) && loc.loc != user && user.get_active_hand() != P) return - + if(istype(P, /obj/item/weapon/stamp/clown)) if(!clown) user << "You are totally unable to use the stamp. HONK!" return - + stamps += "" var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') @@ -323,7 +323,7 @@ /obj/item/weapon/paper/djstation name = "paper - 'DJ Listening Outpost'" - info = "Welcome new owner!

You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
  1. Equip yourself with a multi-tool
  2. Use the multitool on each machine, that is the broadcaster, receiver and the relay.
  3. Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.