diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm
index 33cec462690..a71ed18f5c9 100644
--- a/code/ATMOSPHERICS/components/unary/cold_sink.dm
+++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm
@@ -5,7 +5,7 @@
use_power = 1
name = "Cold Sink"
- desc = "Cools gas when connected to pipe network"
+ desc = "Cools gases when connected to a pipe network."
var/on = 0
@@ -30,4 +30,4 @@
if(abs(old_temperature-air_contents.temperature) > 1)
network.update = 1
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/WorkInProgress/pomf/spacepods/spacepods.dm b/code/WorkInProgress/pomf/spacepods/spacepods.dm
index 33e51b53593..c6cd5261fa0 100644
--- a/code/WorkInProgress/pomf/spacepods/spacepods.dm
+++ b/code/WorkInProgress/pomf/spacepods/spacepods.dm
@@ -216,15 +216,15 @@
if("pod_civ")
desc = "A sleek civilian space pod."
if("pod_black")
- desc = "An all black space pod with no insignias."
+ desc = "A plain black space pod without any distinctive markings."
if("pod_mil")
- desc = "A dark grey space pod brandishing the Nanotrasen Military insignia"
+ desc = "A dark grey space pod bearing the Nanotrasen military insignia."
if("pod_synd")
- desc = "A menacing military space pod with Fuck NT stenciled onto the side"
+ desc = "A menacing military space pod with \"Fuck NT\" stenciled onto the side."
if("pod_gold")
- desc = "A civilian space pod with a gold body, must have cost somebody a pretty penny"
+ desc = "A civilian space pod with a gold body. It must have cost somebody a pretty penny."
if("pod_industrial")
- desc = "A rough looking space pod meant for industrial work"
+ desc = "A space pod with signs of wear on the plating. A spaceproof sticker designates it for performing industrial tasks."
/obj/spacepod/verb/toggle_internal_tank()
set name = "Toggle internal airtank usage"
@@ -332,7 +332,7 @@
inertia_dir = 0 // engage reverse thruster and power down pod
occupant.forceMove(exit_loc)
occupant = null
- to_chat(usr, "You climb out of the pod")
+ to_chat(usr, "You climb out of the pod.")
/obj/spacepod/verb/move_inside()
set category = "Object"
@@ -343,7 +343,7 @@
if(occupant == usr)
move_outside(usr)
else
- to_chat(usr, "The [src.name] is already occupied!")
+ to_chat(usr, "\The [src] is already occupied!")
return
if(usr.incapacitated() || usr.lying) //are you cuffed, dying, lying, stunned or other
@@ -357,17 +357,17 @@
*/
for(var/mob/living/carbon/slime/M in range(1,usr))
if(M.Victim == usr)
- to_chat(usr, "You're too busy getting your life sucked out of you.")
+ to_chat(usr, "You're too busy getting the life sucked out of you by \the [M]!")
return
// to_chat(usr, "You start climbing into [src.name]")
- visible_message("[usr] starts to climb into [src.name]")
+ visible_message("[usr] starts to climb into \the [src].")
if(enter_after(40,usr))
if(!src.occupant)
moved_inside(usr)
else if(src.occupant!=usr)
- to_chat(usr, "[src.occupant] was faster. Try better next time, loser.")
+ to_chat(usr, "[src.occupant] was faster. Better luck next time, loser.")
else
to_chat(usr, "You stop entering the pod.")
return
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index f44969f607b..bc889b56a5b 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -318,7 +318,7 @@ var/list/uplink_items = list()
//IAA - Internal Affairs Agent
/datum/uplink_item/jobspecific/briefcase_smg
name = "Concealed SMG"
- desc = "A modified briefcase capable of storing and firing a gun under a false bottom. Starts with an internal SMG and 18 rounds. Use a screwdriver to pry away the false bottom and make modifications."
+ desc = "A modified briefcase capable of storing and firing a gun under a false bottom. Starts with an internal SMG and 18 rounds. Use a screwdriver to pry away the false bottom and make modifications. Distinguishable upon close examination due to the added weight."
item = /obj/item/weapon/storage/briefcase/false_bottomed/smg
cost = 12
job = list("Internal Affairs Agent")
@@ -362,7 +362,7 @@ var/list/uplink_items = list()
/datum/uplink_item/dangerous/revolver
name = "Fully Loaded Revolver"
- desc = "A traditional handgun which fires .357 rounds. Has 7 chambers. Can down an unarmoured target with two shots."
+ desc = "A traditional handgun which fires .357 rounds. Has 7 chambers. Can down an unarmored target with two shots."
item = /obj/item/weapon/gun/projectile
cost = 13
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index d57d0860500..cf05a2b8593 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -860,7 +860,7 @@
/obj/item/weapon/ectoplasm
name = "ectoplasm"
- desc = "spooky"
+ desc = "The remnants of a being between the world of the living and the dead. Spooky."
gender = PLURAL
icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm"
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index ac9a26343de..5872eefea47 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -34,7 +34,7 @@
/obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob)
if(checkcult && !iscultist(user))
- to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.")
+ to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to rid yourself of this blade quickly.")
user.Dizzy(120)
@@ -61,7 +61,7 @@
/obj/item/clothing/suit/cultrobes
name = "cult robes"
- desc = "A set of armored robes worn by the followers of Nar-Sie"
+ desc = "A set of armored robes worn by the followers of Nar-Sie."
icon_state = "cultrobes"
item_state = "cultrobes"
flags = FPRINT
@@ -84,7 +84,7 @@
/obj/item/clothing/suit/magusred
name = "magus robes"
- desc = "A set of armored robes worn by the followers of Nar-Sie"
+ desc = "A set of armored robes worn by the followers of Nar-Sie."
icon_state = "magusred"
item_state = "magusred"
flags = FPRINT
@@ -103,10 +103,10 @@
siemens_coefficient = 0
/obj/item/clothing/suit/space/cult
- name = "cult armour"
+ name = "cult armor"
icon_state = "cult_armour"
item_state = "cult_armour"
- desc = "A bulky suit of armour, bristling with spikes. It looks space proof."
+ desc = "A bulky suit of armor bristling with spikes. It looks space proof."
w_class = W_CLASS_MEDIUM
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen)
slowdown = 0
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index d7d55a4d791..d4fdc66f81b 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -127,7 +127,7 @@
Fuu ma'jin - Allows you to stun a person by attacking them with the talisman.
Kal om neth - Summons a soul stone
Da A'ig Osk - Summons a construct shell for use with captured souls. It is too large to carry on your person.
"}
-//Sa tatha najin - Allows you to summon armoured robes and an unholy blade
//Kept for reference
+//Sa tatha najin - Allows you to summon armored robes and an unholy blade
//Kept for reference
usr << browse(dat, "window=id_com;size=350x200")
return
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 47c48e853a9..bb328b82aae 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -40,6 +40,7 @@
var/list/air_scrub_info = list()
/obj/machinery/alarm
+ desc = "An alarm used to control the area's atmospherics systems."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm0"
anchored = 1
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index e39182321ae..c38185b6cea 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -7,6 +7,7 @@
/obj/machinery/portable_atmospherics/canister
name = "canister"
+ desc = "A container for gases. Can be used with atmospherics machinery through interaction with a port, and can also fill man-portable tanks."
icon = 'icons/obj/atmos.dmi'
icon_state = "yellow"
density = 1
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index cd13b095864..28e7127bf4d 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -1,5 +1,6 @@
/obj/machinery/recharger
name = "recharger"
+ desc = "A charging station for energy weapons that draws from the area's power. Simply insert an energy weapon with a cell to begin recharging."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "recharger0"
anchored = 1
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 948ea4b7c24..38027cc916e 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1076,7 +1076,7 @@
return
src.log_message("[usr] tries to move in.")
if (src.occupant)
- to_chat(usr, "The [src.name] is already occupied!")
+ to_chat(usr, "\The [src] is already occupied!")
src.log_append_to_last("Permission denied.")
return
/*
@@ -1099,7 +1099,7 @@
to_chat(usr, "You're too busy getting your life sucked out of you.")
return
- visible_message("[usr] starts to climb into [src.name]")
+ visible_message("[usr] starts to climb into \the [src].")
if(enter_after(40,usr))
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index f9e261cfcda..d88409382bf 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -690,4 +690,4 @@
Co_NEXTSTEP = list(Co_KEY=/obj/item/weapon/wrench,
Co_VIS_MSG = "{USER} connect{s} {HOLDER} hydraulic systems.")
)
- )
\ No newline at end of file
+ )
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 9fe24d58b6b..e55747058c9 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -19,7 +19,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda
name = "\improper PDA"
- desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge. Can download additional applications from PDA terminals."
+ desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a pre-programmed ROM cartridge. Can download additional applications from PDA terminals."
icon = 'icons/obj/pda.dmi'
icon_state = "pda"
item_state = "electronic"
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index ece3759afb7..0078d9e710c 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -1,5 +1,6 @@
/obj/item/device/aicard
name = "inteliCard"
+ desc = "A device that stores artifical intelligence units."
icon = 'icons/obj/pda.dmi'
icon_state = "aicard" // aicard-full
item_state = "electronic"
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 1e2929c8215..db10aa126af 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -1,5 +1,6 @@
/obj/item/device/chameleon
name = "chameleon-projector"
+ desc = "A device that can scan an object's appearance and cloak a user."
icon_state = "shield0"
flags = FPRINT
siemens_coefficient = 1
diff --git a/code/game/objects/items/weapons/ai_modules/AI_modules.dm b/code/game/objects/items/weapons/ai_modules/AI_modules.dm
index 30d8baf4a69..cd00f194de2 100644
--- a/code/game/objects/items/weapons/ai_modules/AI_modules.dm
+++ b/code/game/objects/items/weapons/ai_modules/AI_modules.dm
@@ -146,9 +146,12 @@ Refactored AI modules by N3X15
/******************** keeper (MoMMIs only) *******************/
/obj/item/weapon/aiModule/keeper
- name = "'Keeper' AI Module"
+ modname = "KEEPER"
desc = "HOW DID YOU GET THIS OH GOD WHAT. Hidden lawset for MoMMIs."
+/obj/item/weapon/aiModule/keeper/updateLaw()
+ return
+
/obj/item/weapon/aiModule/keeper/upload(var/datum/ai_laws/laws, var/atom/target, var/mob/sender)
..()
target:keeper=1
diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm
index 368e83ab4d6..bb9df0afd6d 100644
--- a/code/game/objects/items/weapons/airlock_painter.dm
+++ b/code/game/objects/items/weapons/airlock_painter.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/airlock_painter
name = "airlock painter"
- desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob."
+ desc = "An advanced autopainter pre-programmed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob."
icon = 'icons/obj/objects.dmi'
icon_state = "paint sprayer"
item_state = "paint sprayer"
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 0530cf43caf..add8d03718a 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -407,7 +407,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
/obj/item/clothing/mask/cigarette/cigar
name = "Premium Cigar"
- desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!"
+ desc = "A large roll of tobacco and... well, you're not quite sure. This thing's huge!"
icon_state = "cigar"
overlay_on = "cigarlit"
flags = FPRINT
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index b2d4a42e8cc..74fb6dc9441 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/teleportation_scroll
name = "scroll of teleportation"
- desc = "A scroll for moving around."
+ desc = "A scroll allowing limited uses of transportation."
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
var/uses = 4.0
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index a8a98bfa60c..c657dd6ade4 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -122,7 +122,7 @@
/obj/item/weapon/storage/box/syndie_kit
name = "Box"
- desc = "A sleek, sturdy box"
+ desc = "A sleek, sturdy box."
icon_state = "box_of_doom"
/obj/item/weapon/storage/box/syndie_kit/imp_freedom
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index d602f61dd1e..0ef739a8aa5 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -34,17 +34,17 @@
..()
if(smashed)
- to_chat(user, "The protective glass shield has been damaged beyond repair")
+ to_chat(user, "The protective glass shield has been damaged beyond repair.")
else if(hitstaken)
- to_chat(user, "You count [hitstaken] impacts on the protective glass shield")
+ to_chat(user, "There are [hitstaken] impacts on the protective glass shield.")
else
- to_chat(user, "The protective glass shield appears intact")
+ to_chat(user, "The protective glass shield appears intact.")
if(!fireaxe)
- to_chat(user, "The fireaxe is gone from the cabinet")
+ to_chat(user, "The fireaxe is missing from the cabinet.")
else
- to_chat(user, "The fireaxe is still in the cabinet [localopened ? "and up for grabs" : "behind the protective glass"]")
+ to_chat(user, "The fireaxe is still in the cabinet [localopened ? "and up for grabs" : "behind the protective glass"].")
- to_chat(user, "A small [locked ? "red" : "green"] light indicates the cabinet is [locked ? "" : "un"]locked")
+ to_chat(user, "A small [locked ? "red" : "green"] light indicates the cabinet is [locked ? "" : "un"]locked.")
/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
@@ -56,8 +56,8 @@
if(isrobot(usr) || src.locked)
if(istype(O, /obj/item/device/multitool))
- visible_message("[user] starts fiddling with \the [src]'s locking module", \
- "You start disabling \the [src]'s locking module")
+ visible_message("[user] starts fiddling with \the [src]'s locking module.", \
+ "You start disabling \the [src]'s locking module.")
playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
if(do_after(user, src, 50))
locked = 0
@@ -80,7 +80,7 @@
hitstaken++
if(hitstaken == 4) //Slam
playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
- visible_message("\The [src]'s protective glass shatters, exposing its content.")
+ visible_message("\The [src]'s protective glass shatters, exposing its contents.")
smashed = 1
locked = 0
localopened = 1
@@ -102,7 +102,7 @@
update_icon()
else
if(smashed)
- to_chat(user, "[src]'s protective glass is broken. Cutting hazard right there!")
+ to_chat(user, "[src]'s protective glass is broken.")
return
if(istype(O, /obj/item/device/multitool))
if(localopened)
@@ -112,8 +112,8 @@
update_icon()
return
else
- visible_message("[user] starts to fiddle with [src]'s locking module", \
- "You start to re-enable [src]'s locking module")
+ visible_message("[user] starts to fiddle with [src]'s locking module.", \
+ "You start to re-enable [src]'s locking module.")
if(do_after(user, src, 50))
locked = 1
visible_message("[user] re-enables [src]'s locking module.", \
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index fbb80c3c692..eb0105b904a 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -1,5 +1,5 @@
/obj/structure/closet/syndicate
- name = "armoury closet"
+ name = "armory closet"
desc = "Why is this here?"
icon_state = "syndicate"
icon_closed = "syndicate"
@@ -137,7 +137,7 @@
return
/obj/structure/closet/vox_raiders
- name = "vox armoury closet"
+ name = "vox armory closet"
desc = "Polly wants a gun."
icon_state = "syndicate"
icon_closed = "syndicate"
@@ -154,7 +154,7 @@
/obj/structure/closet/vox_raiders/trader
- name = "vox armoury closet"
+ name = "vox armory closet"
desc = "Polly wants a gun."
icon_state = "syndicate"
icon_closed = "syndicate"
diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm
index 6879afdcbd1..f3a35138e1e 100644
--- a/code/game/objects/structures/fitness.dm
+++ b/code/game/objects/structures/fitness.dm
@@ -1,6 +1,6 @@
/obj/structure/punching_bag
name = "punching bag"
- desc = "A punching bag. Can you get to speed level 4???"
+ desc = "A punching bag. Can you get to speed level 4?"
icon = 'icons/obj/fitness.dmi'
icon_state = "punchingbag"
anchored = 1
@@ -71,7 +71,7 @@
/obj/structure/weightlifter
name = "Weight Machine"
- desc = "Just looking at this thing makes you feel tired."
+ desc = "A machine that allows for effective weight training. Just looking at this thing makes you feel tired."
icon = 'icons/obj/fitness.dmi'
icon_state = "fitnessweight"
density = 1
@@ -112,4 +112,4 @@
var/finishmessage = pick("You feel stronger!","You feel like you can take on the world!","You feel robust!","You feel indestructible!")
icon_state = "fitnessweight"
overlays -= W
- to_chat(user, "[finishmessage]")
\ No newline at end of file
+ to_chat(user, "[finishmessage]")
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 3f1abc0b3fe..d6ad055140e 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -645,7 +645,7 @@ var/global/floorIsLava = 0
Return
"}
else
- dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
+ dat+="Something bad happened. More accurately, this broke. Please make a bug report."
// to_chat(world, "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]")
// to_chat(world, "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]")
@@ -786,13 +786,13 @@ var/global/floorIsLava = 0
[ticker&&ticker.hardcore_mode ? "Disable" : "Enable"] hardcore mode (makes starvation kill!)
Triple AI mode (needs to be used in the lobby)
- Egalitarian Station Mode
+ Egalitarian Station Mode (removes access on doors except for Command and Security)
Make all areas powered
Make all areas unpowered
Power all SMES
Break the station's link with Central Command
- Make the station linked with Central Command
+ Fix the station's link with Central Command
Break all lights
Fix all lights
@@ -804,25 +804,25 @@ var/global/floorIsLava = 0
Send in a strike team
Create a turret
- Everyone is the traitor
- There can be only one!
+ Make everyone traitors
+ Highlander/Wizard Wars Mode (There can be only one!)
Distribute experimental guns to the crew
Ghost Mode
Turn all humans into monkeys
Remove ALL clothing
Make all players retarded
- Make all items look like guns
+ Make all items look like guns (traitor revolvers)
Japanese Animes Mode
Unleash THE BEES onto the crew
- The floor is lava! (DANGEROUS: extremely lame)
+ The floor is lava! (WARNING: extremely lame and DANGEROUS!)
- Turn every players into Bomberman
+ Turn all players into Bomberman
Make Bomberman Bombs actually hurt players
- Make Bomberman Bombs actually destroy stuff
- Make Bomberman Bombs harmless to players(default)
- Make Bomberman Bombs harmless to the environnement(default)
+ Make Bomberman Bombs actually destroy structures
+ Make Bomberman Bombs harmless to players (default)
+ Make Bomberman Bombs harmless to the environment (default)
Final Solutions
(Warning, these will end the round!)
diff --git a/code/modules/clothing/accessories/holster.dm b/code/modules/clothing/accessories/holster.dm
index c06eb04e523..d10feacff0c 100644
--- a/code/modules/clothing/accessories/holster.dm
+++ b/code/modules/clothing/accessories/holster.dm
@@ -116,7 +116,7 @@
//
/obj/item/clothing/accessory/holster/handgun
name = "shoulder holster"
- desc = "A handgun holster. Perfect for concealed carry."
+ desc = "A handgun holster that clips to a suit. Perfect for concealed carry."
holster_verb_name = "Holster (Handgun)"
/obj/item/clothing/accessory/holster/handgun/can_holster(obj/item/weapon/gun/W)
@@ -140,7 +140,7 @@
/obj/item/clothing/accessory/holster/handgun/waist
name = "waistband holster"
- desc = "A handgun holster. Made of expensive leather."
+ desc = "A handgun holster that clips to a suit. Made of expensive leather."
_color = "holster_low"
//
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 33b7783c885..b68a53b3c08 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -102,7 +102,7 @@
//Syndicate
/obj/item/clothing/shoes/magboots/syndie
name = "blood-red magboots"
- desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."
+ desc = "Reverse-engineered red magnetic boots that have a heavy magnetic pull. A tag on it says \"Property of Gorlex Marauders\"."
icon_state = "syndiemag0"
base_state = "syndiemag"
species_fit = list(VOX_SHAPED)
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index b97783f587d..769d325aae3 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -26,7 +26,7 @@
slowdown = 3
-// Vox space gear (vaccuum suit, low pressure armour)
+// Vox space gear (vaccuum suit, low pressure armor)
// Can't be equipped by any other species due to bone structure and vox cybernetics.
@@ -53,7 +53,7 @@
name = "alien pressure suit"
icon_state = "vox-pressure"
item_state = "vox-pressure"
- desc = "A huge, armoured, pressurized suit, designed for distinctly nonhuman proportions."
+ desc = "A huge, armored, pressurized suit, designed for distinctly nonhuman proportions."
/obj/item/clothing/head/helmet/space/vox/carapace
name = "alien visor"
@@ -63,10 +63,10 @@
eyeprot = 3
/obj/item/clothing/suit/space/vox/carapace
- name = "alien carapace armour"
+ name = "alien carapace armor"
icon_state = "vox-carapace"
item_state = "vox-carapace"
- desc = "An armoured, segmented carapace with glowing purple lights. It looks pretty run-down."
+ desc = "An armored, segmented carapace with glowing purple lights. It looks pretty run-down."
/obj/item/clothing/head/helmet/space/vox/stealth
name = "alien stealth helmet"
@@ -88,7 +88,7 @@
desc = "An alien helmet with enormous goggled lenses."
/obj/item/clothing/suit/space/vox/medic
- name = "alien armour"
+ name = "alien armor"
icon_state = "vox-medic"
item_state = "vox-medic"
desc = "An almost organic looking nonhuman pressure suit."
@@ -123,7 +123,7 @@
/obj/item/clothing/shoes/magboots/vox
- desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor."
+ desc = "A pair of heavy, jagged armored foot pieces. They seem suitable for a velociraptor."
name = "vox boots"
item_state = "boots-vox"
icon_state = "boots-vox"
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index cca79983b8d..64b928bd8c5 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -183,7 +183,7 @@
/obj/item/clothing/suit/space/rig/syndi
icon_state = "rig-syndi"
name = "blood-red hardsuit"
- desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
+ desc = "An advanced suit that protects against injuries during special operations. A tag on it says \"Property of Gorlex Marauders\"."
item_state = "syndie_hardsuit"
species_fit = list(GREY_SHAPED)
species_fit = list(VOX_SHAPED)
@@ -390,7 +390,7 @@
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/)
pressure_resistance = 40 * ONE_ATMOSPHERE
-
+
//Death squad rig
/obj/item/clothing/head/helmet/space/rig/deathsquad
name = "deathsquad helmet"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 3cd683f8104..82d7ec69624 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/under/syndicate
name = "tactical turtleneck"
- desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
+ desc = "A non-descript, slightly suspicious piece of civilian clothing."
icon_state = "syndicate"
item_state = "bl_suit"
_color = "syndicate"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 165b99ed6d5..41350c70879 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -88,7 +88,7 @@
/mob/living/simple_animal/crab/snowy
name = "Snowy"
- desc = "While you'd think that most crabs in cold climates would stick to the relatively warmer water, this one's adapted to living on the land and has camouflage to boot"
+ desc = "While you'd think that most crabs in cold climates would stick to the relatively warmer water, this one's adapted to living on the land and even has camouflage to boot!"
icon_state = "snowcrab"
icon_living = "snowcrab"
- icon_dead = "snowcrab_dead"
\ No newline at end of file
+ icon_dead = "snowcrab_dead"
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index f10acb491b8..45f9dc32007 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/faithless
name = "The Faithless"
- desc = "The Wish Granter's faith in humanity, incarnate"
+ desc = "A being of shadow. It posesses a menacing gaze and a tortured voice."
icon_state = "faithless"
icon_living = "faithless"
icon_dead = "faithless_dead"
@@ -104,4 +104,4 @@
if(!target || enroute)
spawn(10)
if(!src.stat)
- horde()
\ No newline at end of file
+ horde()
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 676ea0a4c7c..6550505e944 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -3,7 +3,7 @@
#define MAGAZINE 2 //the gun takes a magazine into gun storage
/obj/item/weapon/gun/projectile
- desc = "A classic revolver. Uses 357 ammo."
+ desc = "A classic revolver. Uses .357 ammo."
name = "revolver"
icon_state = "revolver"
caliber = list("357" = 1)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 58203d68f27..6442074e461 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -78,7 +78,7 @@
/obj/item/weapon/gun/projectile/automatic/mini_uzi
name = "Uzi"
- desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
+ desc = "A lightweight, fast firing gun for when you definitely want someone dead. Uses .45 rounds."
icon_state = "mini-uzi"
item_state = null
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/guninhands_left.dmi', "right_hand" = 'icons/mob/in-hand/right/guninhands_right.dmi')
@@ -95,7 +95,7 @@
/obj/item/weapon/gun/projectile/automatic/c20r
name = "\improper C-20r SMG"
- desc = "A lightweight, fast firing gun, for when you REALLY need someone dead. Uses 12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp"
+ desc = "A lightweight, fast firing gun for when you REALLY want someone dead. Uses 12mm rounds. Has a \"Scarborough Arms - Per falcis, per pravitas\" buttstamp."
icon_state = "c20r"
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/guns.dmi', "right_hand" = 'icons/mob/in-hand/right/guns.dmi')
item_state = "c20r"
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 87300eec8d9..99c953ca9d0 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -242,7 +242,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
- desc = "A newly-developed high-capacity beaker, courtesy of bluespace research. Can hold up to 200 units."
+ desc = "A newly-developed high-capacity beaker that uses advances in bluespace research. Can hold up to 200 units."
icon_state = "beakerbluespace"
starting_materials = list(MAT_GLASS = 2000)
volume = 200
@@ -253,7 +253,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/bluespace/large
name = "large bluespace beaker"
- desc = "A prototype ultra-capacity beaker, courtesy of bluespace research. Can hold up to 300 units."
+ desc = "A prototype ultra-capacity beaker that uses advances in bluespace research. Can hold up to 300 units."
icon_state = "beakerbluespacelarge"
starting_materials = list(MAT_GLASS = 5000)
volume = 300
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 64906759d9e..e6930613191 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -261,7 +261,7 @@
/obj/structure/reagent_dispensers/beerkeg
name = "beer keg"
- desc = "A beer keg"
+ desc = "A massive keg with a bottle of beer painted on the front."
icon = 'icons/obj/objects.dmi'
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10