diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 6d593d5dc22..5131f6d2a5c 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -103,7 +103,7 @@
var/mob/living/carbon/monkey/target = null
/obj/effect/sign/securearea
- desc = "A warning sign which reads 'SECURE AREA'. This obviously applies to a nun-Clown."
+ desc = "A warning sign which reads 'SECURE AREA'"
name = "SECURE AREA"
icon = 'decals.dmi'
icon_state = "securearea"
@@ -150,8 +150,8 @@
pixel_y = -1
/obj/effect/sign/fire
- desc = "A warning sign which reads 'HOT! HOT! AAAH! I'M BURNING!'"
- name = "HOT! HOT! AAAH! I'M BURNING!"
+ desc = "A warning sign which reads 'EXTREME TEMPERATURES'"
+ name = "EXTREME TEMPERATURES"
icon = 'decals.dmi'
icon_state = "fire"
anchored = 1.0
@@ -212,7 +212,7 @@
del(src)*/
/obj/effect/sign/maltesefalcon1 //The sign is 64x32, so it needs two tiles. ;3
- desc = "The Maltese Falcon, Space Bar and Grill. Now with added monkey."
+ desc = "The Maltese Falcon, Space Bar and Grill."
name = "The Maltese Falcon"
icon = 'decals.dmi'
icon_state = "maltesefalcon1"
@@ -221,7 +221,7 @@
density = 0
/obj/effect/sign/maltesefalcon2
- desc = "The Maltese Falcon, Space Bar and Grill. Now with added monkey."
+ desc = "The Maltese Falcon, Space Bar and Grill."
name = "The Maltese Falcon"
icon = 'decals.dmi'
icon_state = "maltesefalcon2"
@@ -289,7 +289,7 @@
/obj/item/device/multitool
name = "multitool"
- desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
+ desc = "Used for pulsing wires to test which to cut."
icon_state = "multitool"
flags = FPRINT | TABLEPASS| CONDUCT
force = 5.0
@@ -297,7 +297,6 @@
throwforce = 5.0
throw_range = 15
throw_speed = 3
- desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
m_amt = 50
g_amt = 20
origin_tech = "magnets=1;engineering=1"
@@ -445,7 +444,7 @@
anchored =1
var/netnum = 0
name = "power cable"
- desc = "A flexible superconducting cable for heavy-duty power transfer. Comes in clown colors now."
+ desc = "A flexible superconducting cable for heavy-duty power transfer."
icon = 'power_cond_red.dmi'
icon_state = "0-1"
var/d1 = 0
@@ -473,7 +472,7 @@
/obj/structure/morgue
name = "morgue"
- desc = "Used to keep bodies in untill someone fetches them."
+ desc = "Used to keep bodies in until someone fetches them."
icon = 'stationobjs.dmi'
icon_state = "morgue1"
density = 1
@@ -482,7 +481,7 @@
/obj/structure/crematorium
name = "crematorium"
- desc = "A human incinerator. Works well on barbeque nights."
+ desc = "An incinerator."
icon = 'stationobjs.dmi'
icon_state = "crema1"
density = 1
@@ -494,7 +493,7 @@
/obj/effect/mine
name = "Mine"
- desc = "I Better stay away from that thing."
+ desc = "I'd better stay away from that thing."
density = 1
anchored = 1
layer = 3
@@ -544,7 +543,7 @@
/obj/effect/portal
name = "portal"
- desc = "Looks unstable. Best to test it with the clown."
+ desc = "Looks unstable."
icon = 'stationobjs.dmi'
icon_state = "portal"
density = 1
@@ -610,7 +609,7 @@
/obj/structure/stool/chair/e_chair
name = "electrified chair"
- desc = "Looks absolutely SHOCKING!"
+ desc = "Looks absolutely terrifying!"
icon_state = "e_chair0"
var/atom/movable/overlay/overl = null
var/on = 0.0
@@ -811,7 +810,7 @@
//BEGIN BRAINS=====================================================
/obj/item/brain
name = "brain"
- desc = "A piece of juicy meat found in a persons head."
+ desc = "A piece of complex biomass found in a persons head."
icon = 'surgery.dmi'
icon_state = "brain2"
flags = TABLEPASS
@@ -902,7 +901,7 @@
name = "desk clutter"
icon = 'items.dmi'
icon_state = "deskclutter"
- desc = "Some clutter the detective has accumalated over the years..."
+ desc = "Some clutter the desk has accumulated over the years..."
anchored = 1
/obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER
@@ -979,7 +978,7 @@
/obj/item/stack/rods
name = "metal rods"
- desc = "Some rods. Can be used for building, or something."
+ desc = "Some rods. Can be used for building."
singular_name = "metal rod"
icon_state = "rods"
flags = FPRINT | TABLEPASS| CONDUCT
@@ -1023,7 +1022,7 @@
/obj/item/stack/sheet/glass
name = "glass"
- desc = "HOLY HELL! That is a lot of glass."
+ desc = "That is a lot of glass."
singular_name = "glass sheet"
icon_state = "sheet-glass"
g_amt = 3750
diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm
index 83236ad526f..de716390ede 100644
--- a/code/defines/obj/closet.dm
+++ b/code/defines/obj/closet.dm
@@ -15,7 +15,7 @@
/obj/structure/closet/acloset
name = "Strange closet"
- desc = "It looks alien!"
+ desc = "It looks weird!"
icon_state = "acloset"
icon_closed = "acloset"
icon_opened = "aclosetopen"
@@ -75,7 +75,7 @@
/obj/structure/closet/fireaxecabinet
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."
+ desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe."
var/obj/item/weapon/fireaxe/fireaxe = new/obj/item/weapon/fireaxe
icon_state = "fireaxe1000"
icon_closed = "fireaxe1000"
diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm
index ae0494b855d..316972013a0 100644
--- a/code/defines/obj/computer.dm
+++ b/code/defines/obj/computer.dm
@@ -152,7 +152,7 @@
/obj/machinery/computer/pod
name = "Pod Launch Control"
- desc = "A controll for launching pods. Some people prefer firing Mechas."
+ desc = "A controll for launching pods."
icon_state = "computer_generic"
var/id = 1.0
var/obj/machinery/mass_driver/connected = null
diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm
index 73760141614..eea0a6f926d 100644
--- a/code/defines/obj/decal.dm
+++ b/code/defines/obj/decal.dm
@@ -28,7 +28,7 @@
/obj/effect/decal/point
name = "point"
- desc = "It is an arrow hanging in mid-air. There may be a wizard about."
+ desc = "It is an arrow hanging in mid-air."
icon = 'screen1.dmi'
icon_state = "arrow"
layer = 16.0
@@ -41,7 +41,7 @@
/obj/effect/decal/cleanable/blood
name = "Blood"
- desc = "It's red. Its Gooye. It is the chefs cooking perhaps."
+ desc = "It's red and disgusting."
density = 0
anchored = 1
layer = 2
@@ -94,7 +94,7 @@
/obj/effect/decal/cleanable/xenoblood
name = "xeno blood"
- desc = "It's green. Must be more of the chefs cooking."
+ desc = "It's green. What the hell?"
density = 0
anchored = 1
layer = 2
@@ -242,7 +242,7 @@
//Vomit (sorry)
/obj/effect/decal/cleanable/vomit
name = "Vomit"
- desc = "Gosh, how unpleasant."
+ desc = "Geez, unpleasant."
density = 0
anchored = 1
layer = 2
diff --git a/code/defines/obj/door.dm b/code/defines/obj/door.dm
index 71d2ebd57b2..4b8d10feafb 100644
--- a/code/defines/obj/door.dm
+++ b/code/defines/obj/door.dm
@@ -33,7 +33,7 @@
/obj/machinery/door/poddoor
name = "Podlock"
- desc = "Why it no open!!!"
+ desc = "A type of powerful blast door."
icon = 'rapid_pdoor.dmi'
icon_state = "pdoor1"
var/id = 1.0
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index c4619699d03..15dbf0a4ab4 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -44,7 +44,7 @@
/obj/machinery/camera
name = "Security Camera"
- desc = "This is used to monitor rooms. Can see through walls."
+ desc = "This is used to monitor rooms."
icon = 'monitors.dmi'
icon_state = "camera"
var/network = "SS13"
@@ -61,7 +61,7 @@
active_power_usage = 10
/obj/machinery/dispenser
- desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks."
+ desc = "A simple yet bulky one-way storage device for gas tanks. Holds plasma and oxygen tanks."
name = "Tank Storage Unit"
icon = 'objects.dmi'
icon_state = "dispenser"
@@ -101,7 +101,7 @@
/obj/machinery/firealarm
name = "Fire Alarm"
- desc = "Pull this in case of emergency. Thus keep pulling this forever."
+ desc = "Pull this in case of emergency."
icon = 'monitors.dmi'
icon_state = "fire0"
var/detecting = 1.0
@@ -133,7 +133,7 @@
/obj/machinery/igniter
name = "igniter"
- desc = "Fun for igniting plasma."
+ desc = "Might as well make that detonator, right?"
icon = 'stationobjs.dmi'
icon_state = "igniter1"
var/id = null
@@ -198,7 +198,7 @@
/obj/machinery/scan_console
name = "DNA Scanner Access Console"
- desc = "Scand DNA."
+ desc = "Scan DNA."
icon = 'computer.dmi'
icon_state = "scanner"
density = 1
@@ -220,7 +220,7 @@
/obj/machinery/scan_consolenew
name = "DNA Modifier Access Console"
- desc = "Scand DNA."
+ desc = "Scan DNA."
icon = 'computer.dmi'
icon_state = "scanner"
density = 1
@@ -258,7 +258,6 @@
/obj/machinery/door_control
name = "Remote Door Control"
- desc = "This controls doors."
icon = 'stationobjs.dmi'
icon_state = "doorctrl0"
desc = "A remote control switch for a door."
@@ -270,7 +269,6 @@
/obj/machinery/driver_button
name = "Mass Driver Button"
- desc = "FIRE AWAY!"
icon = 'objects.dmi'
icon_state = "launcherbtt"
desc = "A remote control switch for a Mass Driver."
@@ -283,7 +281,6 @@
/obj/machinery/ignition_switch
name = "Ignition Switch"
- desc = "Activates that igniter."
icon = 'objects.dmi'
icon_state = "launcherbtt"
desc = "A remote control switch for a mounted igniter."
@@ -312,7 +309,7 @@
/obj/machinery/teleport/station
name = "station"
- desc = "The station thingy of a teleport thingy."
+ desc = "The station's hub of a teleport system."
icon_state = "controller"
var/active = 0
var/engaged = 0
@@ -378,7 +375,7 @@
/obj/machinery/power/monitor
name = "Power Monitoring Computer"
- desc = "Used to monitor the power. Pretty useless."
+ desc = "Used to monitor the power."
icon = 'computer.dmi'
icon_state = "power"
density = 1
diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 7e60232d335..7a4a6a2209e 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -14,7 +14,7 @@
/obj/item/weapon/storage/trashbag
name = "trash bag"
- desc = "for picking up all those pens"
+ desc = "For picking up all that trash..."
icon_state = "trashbag"
item_state = "trashbag"
w_class = 4.0
@@ -31,7 +31,7 @@
*/
/obj/item/weapon/storage/pill_bottle
name = "pill bottle"
- desc = "This is told to hold untold horrors of pulls."
+ desc = "A reasonable place to put your pills.."
icon_state = "pill_canister"
icon = 'chemical.dmi'
item_state = "contsolid"
@@ -69,7 +69,7 @@
item_state = "syringe_kit"
/obj/item/weapon/storage/backpack/clown
- name = "Giggles Von Honkerton"
+ name = "clown's backpack"
desc = "The backpack made by Honk. Co."
icon_state = "clownpack"
@@ -100,7 +100,7 @@
/obj/item/weapon/storage/briefcase
name = "briefcase"
- desc = "Used by the lawyer to robust security in the court room."
+ desc = "Used by the lawyer in the court room."
icon_state = "briefcase"
flags = FPRINT | TABLEPASS| CONDUCT
force = 8.0
@@ -136,7 +136,7 @@
/obj/item/weapon/storage/firstaid/fire
name = "Fire First Aid"
- desc = "A kit for when you 'accidently' set toxins on fire and burn yourself."
+ desc = "A kit for when you accidently burn yourself."
icon_state = "ointment"
item_state = "firstaid-ointment"
@@ -151,13 +151,13 @@
/obj/item/weapon/storage/firstaid/toxin
name = "Toxin First Aid"
- desc = "Used to treat when you have a high amoutn of toxins in your body."
+ desc = "Used to treat when you have a high amount of toxins in your body."
icon_state = "antitoxin"
item_state = "firstaid-toxin"
/obj/item/weapon/storage/firstaid/o2
name = "Oxygen Deprivation First Aid"
- desc = "A box full of oxygen goodies."
+ desc = "A box full of oxygenating goodies."
icon_state = "o2"
item_state = "firstaid-o2"
@@ -189,7 +189,7 @@
/obj/item/weapon/storage/id_kit
name = "Spare IDs"
- desc = "Has so many empty IDs."
+ desc = "Has so many blank IDs."
icon_state = "id"
item_state = "syringe_kit"
@@ -201,13 +201,13 @@
/obj/item/weapon/storage/injectbox
name = "DNA-Injectors"
- desc = "This box contains injectors it seems."
+ desc = "This box contains injectors, it seems."
icon_state = "box"
item_state = "syringe_kit"
/obj/item/weapon/storage/stma_kit
name = "Sterile Masks"
- desc = "This box contains masks of sterility."
+ desc = "This box contains masks of +2 constitution." //I made it better. --SkyMarshal
icon_state = "latex"
item_state = "syringe_kit"
@@ -225,7 +225,7 @@
/obj/item/weapon/storage/toolbox
name = "toolbox"
- desc = "Danger. Very robust."
+ desc = "Danger. Very heavy."
icon = 'storage.dmi'
icon_state = "red"
item_state = "toolbox_red"
diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm
index 8be79927c6c..ee4e47ab1c8 100644
--- a/code/defines/obj/toy.dm
+++ b/code/defines/obj/toy.dm
@@ -241,7 +241,7 @@
/obj/item/toy/crayonbox
name = "box of crayons"
- desc = "A box of crayons for all your rune drawing needs."
+ desc = "A box of crayons for all your drawing needs."
icon = 'crayons.dmi'
icon_state = "crayonbox"
w_class = 2.0
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index b326f0fcbfe..5eded119f93 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -444,7 +444,7 @@
/obj/item/weapon/card/emag
desc = "An identification card. Seems to have some funny chip on it, though."
- name = "identification card"
+ name = "modified identification card"
icon_state = "emag"
item_state = "card-id"
origin_tech = "magnets=2;syndicate=2"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e1227e6eb45..b676da8ffbd 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -727,40 +727,6 @@
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
- if (href_list["defense"])
- if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
- var/mob/living/M = locate(href_list["defense"])
- if (isliving(M) && istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- switch(alert("Shall they be equipped with a flash or mace?",,"Flash","Mace", "Cancel"))
- if("Flash")
- if(!H.s_store)
- H.equip_if_possible(new /obj/item/device/flash(H), H.slot_l_store)
- else if(!H.s_store)
- H.equip_if_possible(new /obj/item/device/flash(H), H.slot_s_store)
- else
- alert("The target lacked an open pocket.", null, null, null, null, null)
- return
- if("Mace")
- if(!H.s_store)
- H.equip_if_possible(new /obj/item/weapon/pepperspray/small(H), H.slot_l_store)
- else if(!H.s_store)
- H.equip_if_possible(new /obj/item/weapon/pepperspray/small(H), H.slot_s_store)
- else
- alert("The target lacked an open pocket.", null, null, null, null, null)
- return
- if("Cancel")
- return
- message_admins("\red Admin [key_name_admin(usr)] gave [key_name_admin(M)] something to defend themselves!", 1)
- log_admin("[key_name(usr)] defensified [key_name(M)]")
- return
- else
- alert("This action can only be performed on living humans.", null, null, null, null, null)
- return
- else
- alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
- return
-
if (href_list["makeai"]) //Yes, im fucking lazy, so what? it works ... hopefully
if (src.level>=3)
var/mob/M = locate(href_list["makeai"])
@@ -1808,7 +1774,6 @@
foo += text("Prison | ")
// foo += text("Maze | ")
foo += text("Heal/Revive | ")
- foo += text("Defensize | ")
else
foo += text("Hasn't Entered Game | ")
foo += text("Forcesay | ")
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index aa88951b244..7435036350c 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ