more flavor text fixes round 2 (#13126)

* look at the branch name of the last pr and this one

* fix and add

* added one

* cabinet

* more

* flavor text and KEEPER AI module bugfix but why?

* \the

* real flavor text hours also secrets and an email account

* ace coder over here

* revert fun removal and fix things

* cig

* let's see if this resolves inti's remaining change

* oh hey pomf copy-pasted from mecha.dm

* this didn't commit wtf

* "whyyyyyyy", said the bauds. and nothing got done that day

* there was even another src.name

* exxion

* revert fun description removal

* whoops didn't commit vox change

* spooky

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
+	return 1

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, "<span class='notice'>You climb out of the pod</span>")
+		to_chat(usr, "<span class='notice'>You climb out of the pod.</span>")
 
 /obj/spacepod/verb/move_inside()
 	set category = "Object"
@@ -343,7 +343,7 @@
 		if(occupant == usr)
 			move_outside(usr)
 		else
-			to_chat(usr, "<span class='notice'><B>The [src.name] is already occupied!</B></span>")
+			to_chat(usr, "<span class='notice'><B>\The [src] is already occupied!</B></span>")
 			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("<span class='notice'>[usr] starts to climb into [src.name]</span>")
+	visible_message("<span class='notice'>[usr] starts to climb into \the [src].</span>")
 
 	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

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
 

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"

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, "<span class='warning'>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.</span>")
+		to_chat(user, "<span class='warning'>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.</span>")
 		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

code/game/gamemodes/cult/talisman.dm

@@ -127,7 +127,7 @@
 <A href='?src=\ref[src];rune=runestun'>Fuu ma'jin</A> - Allows you to stun a person by attacking them with the talisman.<BR>
 <A href='?src=\ref[src];rune=soulstone'>Kal om neth</A> - Summons a soul stone<BR>
 <A href='?src=\ref[src];rune=construct'>Da A'ig Osk</A> - Summons a construct shell for use with captured souls. It is too large to carry on your person.<BR>"}
-//<A href='?src=\ref[src];rune=armor'>Sa tatha najin</A> - Allows you to summon armoured robes and an unholy blade<BR> //Kept for reference
+//<A href='?src=\ref[src];rune=armor'>Sa tatha najin</A> - Allows you to summon armored robes and an unholy blade<BR> //Kept for reference
 	usr << browse(dat, "window=id_com;size=350x200")
 	return
 

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

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

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

code/game/mecha/mecha.dm

@@ -1076,7 +1076,7 @@
 		return
 	src.log_message("[usr] tries to move in.")
 	if (src.occupant)
-		to_chat(usr, "<span class='bnotice'>The [src.name] is already occupied!</span>")
+		to_chat(usr, "<span class='bnotice'>\The [src] is already occupied!</span>")
 		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("<span class='notice'>[usr] starts to climb into [src.name]</span>")
+	visible_message("<span class='notice'>[usr] starts to climb into \the [src].</span>")
 
 
 	if(enter_after(40,usr))

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.")
 					 	)
-					)
+					)

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"

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"

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

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

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"

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

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

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

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("<span class='notice'>[user] starts fiddling with \the [src]'s locking module</span>", \
-			"<span class='notice'>You start disabling \the [src]'s locking module</span>")
+			visible_message("<span class='notice'>[user] starts fiddling with \the [src]'s locking module.</span>", \
+			"<span class='notice'>You start disabling \the [src]'s locking module.</span>")
 			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("<span class='warning'>\The [src]'s protective glass shatters, exposing its content.")
+						visible_message("<span class='warning'>\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, "<span class='warning'>[src]'s protective glass is broken. Cutting hazard right there!</span>")
+				to_chat(user, "<span class='warning'>[src]'s protective glass is broken.</span>")
 				return
 			if(istype(O, /obj/item/device/multitool))
 				if(localopened)
@@ -112,8 +112,8 @@
 						update_icon()
 					return
 				else
-					visible_message("<span class='notice'>[user] starts to fiddle with [src]'s locking module</span>", \
-					"<span class='notice'>You start to re-enable [src]'s locking module</span>")
+					visible_message("<span class='notice'>[user] starts to fiddle with [src]'s locking module.</span>", \
+					"<span class='notice'>You start to re-enable [src]'s locking module.</span>")
 					if(do_after(user, src, 50))
 						locked = 1
 						visible_message("<span class='notice'>[user] re-enables [src]'s locking module.</span>", \

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"

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, "<span class='notice'>[finishmessage]</span>")
+		to_chat(user, "<span class='notice'>[finishmessage]</span>")

code/modules/admin/admin.dm

@@ -645,7 +645,7 @@ var/global/floorIsLava = 0
 				<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>
 			"}
 		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
 			<BR>
 			<A href='?src=\ref[src];secretsfun=hardcore_mode'>[ticker&&ticker.hardcore_mode ? "Disable" : "Enable"] hardcore mode (makes starvation kill!)</A><BR>
 			<A href='?src=\ref[src];secretsfun=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
-			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode</A><BR>
+			<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode (removes access on doors except for Command and Security)</A><BR>
 			<BR>
 			<A href='?src=\ref[src];secretsfun=power'>Make all areas powered</A><BR>
 			<A href='?src=\ref[src];secretsfun=unpower'>Make all areas unpowered</A><BR>
 			<A href='?src=\ref[src];secretsfun=quickpower'>Power all SMES</A><BR>
 			<A href='?src=\ref[src];secretsfun=breaklink'>Break the station's link with Central Command</A><BR>
-			<A href='?src=\ref[src];secretsfun=makelink'>Make the station linked with Central Command</A><BR>
+			<A href='?src=\ref[src];secretsfun=makelink'>Fix the station's link with Central Command</A><BR>
 			<A href='?src=\ref[src];secretsfun=blackout'>Break all lights</A><BR>
 			<A href='?src=\ref[src];secretsfun=whiteout'>Fix all lights</A><BR>
 			<BR>
@@ -804,25 +804,25 @@ var/global/floorIsLava = 0
 			<A href='?src=\ref[src];secretsfun=striketeam'>Send in a strike team</A><BR>
 			<A href='?src=\ref[src];secretsfun=placeturret'>Create a turret</A><BR>
 			<BR>
-			<A href='?src=\ref[src];secretsfun=traitor_all'>Everyone is the traitor</A><BR>
-			<A href='?src=\ref[src];secretsfun=onlyone'>There can be only one!</A><BR>
+			<A href='?src=\ref[src];secretsfun=traitor_all'>Make everyone traitors</A><BR>
+			<A href='?src=\ref[src];secretsfun=onlyone'>Highlander/Wizard Wars Mode (There can be only one!)</A><BR>
 			<A href='?src=\ref[src];secretsfun=experimentalguns'>Distribute experimental guns to the crew</A><BR>
 			<A href='?src=\ref[src];secretsfun=flicklights'>Ghost Mode</A><BR>
 			<A href='?src=\ref[src];secretsfun=monkey'>Turn all humans into monkeys</A><BR>
 			<BR>
 			<A href='?src=\ref[src];secretsfun=sec_all_clothes'>Remove ALL clothing</A><BR>
 			<A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
-			<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
+			<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns (traitor revolvers)</A><BR>
 			<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
 			<BR>
 			<A href='?src=\ref[src];secretsfun=thebees'>Unleash THE BEES onto the crew</A><BR>
-			<A href='?src=\ref[src];secretsfun=floorlava'>The floor is lava! (DANGEROUS: extremely lame)</A><BR>
+			<A href='?src=\ref[src];secretsfun=floorlava'>The floor is lava! (WARNING: extremely lame and DANGEROUS!)</A><BR>
 			<BR>
-			<A href='?src=\ref[src];secretsfun=massbomber'>Turn every players into Bomberman</A><BR>
+			<A href='?src=\ref[src];secretsfun=massbomber'>Turn all players into Bomberman</A><BR>
 			<A href='?src=\ref[src];secretsfun=bomberhurt'>Make Bomberman Bombs actually hurt players</A><BR>
-			<A href='?src=\ref[src];secretsfun=bomberdestroy'>Make Bomberman Bombs actually destroy stuff</A><BR>
-			<A href='?src=\ref[src];secretsfun=bombernohurt'>Make Bomberman Bombs harmless to players(default)</A><BR>
-			<A href='?src=\ref[src];secretsfun=bombernodestroy'>Make Bomberman Bombs harmless to the environnement(default)</A><BR>
+			<A href='?src=\ref[src];secretsfun=bomberdestroy'>Make Bomberman Bombs actually destroy structures</A><BR>
+			<A href='?src=\ref[src];secretsfun=bombernohurt'>Make Bomberman Bombs harmless to players (default)</A><BR>
+			<A href='?src=\ref[src];secretsfun=bombernodestroy'>Make Bomberman Bombs harmless to the environment (default)</A><BR>
 			<BR>
 			<B>Final Solutions</B><BR>
 			<I>(Warning, these will end the round!)</I><BR>

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"
 
 //

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)

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"

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"

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"

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"
+	icon_dead = "snowcrab_dead"

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()
+				horde()

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)

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"

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

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