[MIRROR] Tiny grammar tweaks

code/game/objects/structures/morgue.dm

@@ -12,7 +12,7 @@
 
 /obj/structure/morgue
 	name = "morgue"
-	desc = "Used to keep bodies in untill someone fetches them."
+	desc = "A refrigerated unit used to store bodies, or for surreptitious naps."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "morgue1"
 	dir = EAST

code/modules/client/client procs.dm

@@ -70,7 +70,7 @@
 
 	if(href_list["irc_msg"])
 		if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes
-			to_chat(usr, "<span class='warning'>You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you</span>")
+			to_chat(usr, "<span class='warning'>You are no longer able to use this, it's been more than 10 minutes since an admin on IRC has responded to you</span>")
 			return
 		if(mute_irc)
 			to_chat(usr, "<span class='warning'You cannot use this as your client has been muted from sending messages to the admins on IRC</span>")

code/modules/projectiles/guns/projectile/revolver.dm

@@ -218,16 +218,12 @@
  * Mako
  */
 /obj/item/weapon/gun/projectile/revolver/lemat
-	name = "\improper \"Mako\" Revolver"
-	desc = "The Bishamonten P100 Mako is a 9 shot revolver with a secondary firing barrel loading shotgun shells. \
-	For when you really need something dead. A rare yet deadly collector's item. Uses .38-Special and 12g rounds depending on the barrel."
-	description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first \
-	extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies \
-	that would go on to become today’s TSCs. Focused on sleek ‘futurist’ designs which have largely fallen out of \
-	fashion but remain popular with collectors and people hoping to make some quick thalers from replica weapons. \
-	Bishamonten weapons tended to be form over function - despite their flashy looks, most were completely \
-	unremarkable one way or another as weapons and used very standard firing mechanisms - the Mako was a notable \
-	exception, and original examples are much sought after."
+	name = "Mako revolver"
+	desc = "The Bishamonten P100 Mako is a 9 shot revolver with a secondary firing barrel loading shotgun shells. For when you really need something dead. A rare yet deadly collector's item. Uses .38-Special and 12g rounds depending on the barrel."
+	description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies that would go on to become today’s TSCs. \
+	Focused on sleek ‘futurist’ designs which have largely fallen out of fashion but remain popular with collectors and people hoping to make some quick thalers from replica weapons. \
+	Bishamonten weapons tended to be form over function - despite their flashy looks, most were completely unremarkable one way or another as weapons, and used very standard firing mechanisms - \
+	the Mako was a notable exception, so original examples are much sought after."
 	icon_state = "combatrevolver"
 	item_state = "revolver"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)

maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm

@@ -854,6 +854,7 @@
 /area/submap/Blackshuttledown)
 
 (1,1,1) = {"
+<<<<<<< HEAD
 aa
 aa
 aa
@@ -2147,4 +2148,41 @@ aa
 aa
 aa
 aa
+=======
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaabababababacababababababababadadabacabababababacabababababababababaa
+aaababababababaeabababababababadadababababababababababababadafababacaa
+aaabababababababababababababadadabababafabababafababaeababadadabababaa
+aaababafabadadadababababafababababababababababababababababadadabababaa
+aaabababababadadadabacababababagagagagagagabababababacabafabadabababaa
+aaababababababadadabafababababagahabababagabababababababababababababaa
+aaabababababababaiajajajakababagabababahagabababafaiajajajajakabababaa
+aaabababababababajajajajajajajajajababajajajajajajajajajajajalamababaa
+aaababababafababajajajajajajanaoajapapajaqarasatauajajajajajalamababaa
+aaabababababababavajajawaxajayazajaAaAajaBaCaDaEaEaEaFajajaGababababaa
+aaabababababababaHajajaIaJajayaKaLaLaMajaBaNaNaEaOaDaPajaGabababababaa
+aaabafababababaHajaQajawaRajayaSaTaTaUajaVaWaEaXaYaZbaajababababafabaa
+aaabababababaHajbbbcajbdajajayazajajajajajajbeajajajajajbfabababababaa
+aaabababababajbgbhazajbiaLaLbhazajbjbkblbmbnblblajbobobpajbfababababaa
+aaabababababbqbrblazajbsblblblbtajblblbububublblajbvblblbwalamabababaa
+aaabababababbxbrblaKbybhblbzblblbAblblbBbCbCblblbDblblblbKalamabababaa
+aaabababababbxbrblaSbEbFblblblblbAblblbCbCbCblblbDblblblbKalamabababaa
+aaabababababbGbrblazajbsblblblbtajblblbububublblajbHblblbIalamabababaa
+aaabababababajbJbFcsajbLaTaTbFbMajbNbOblbPbnblblajbQbRbSajaGababababaa
+aaabababababavajbTbUajbdajajayazajajajajajajbAajajajajajaGabababababaa
+aaababababababavajaQajawbVajaybWaLaLbXajbYblblblblbZcaajababababababaa
+aaabafabababababavajajcbccajayaSaTaTcdajceblbYblbYajcfajbfabafabababaa
+aaabababababababaHajajcgchajaycrajaAaAajbYblbYblbYajciajajbfababababaa
+aaabababababababajajajajajajcjckajapapajbYclcmcncoajajajajalamabababaa
+aaabababababababajajajajajajajajajababajajajajajajajajajajalamabababaa
+aaababafababababcpajajajcqababagahabababagabababcpajajajajcqababababaa
+aaabababadabababababafababababagabababahagababafabafabababadadadababaa
+aaababadadabacababababafabababagagagagagagababababacababadadadadababaa
+aaabadadadabababababababaeababababababababababadadabababadadadadababaa
+aaababadadababacabadababababababababababababadadadababababadadabababaa
+aaabababababababadadafabababafababababacabadadadafabababababababababaa
+aaabababafababadadadababababababababafabadadadadabababababababafababaa
+aaabababababababadadabacabababababababababababadaeabacafababababababaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+>>>>>>> dec29038c7... Merge pull request #14402 from VOREStation/upstream-merge-8907
 "}