From c371f245143ab3e460844445ea7192abe6e32921 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Sun, 22 Mar 2015 19:30:26 +0100
Subject: [PATCH 01/11] Fixes #8565.

Increases the name change limit from 30 seconds to 5 minutes.
---
 code/__HELPERS/unsorted.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 89da5859244..c65698933c0 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -308,8 +308,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		var/newname
 
 		for(var/i=1,i<=3,i++)	//we get 3 attempts to pick a suitable name.
-			newname = input(src,"You are a [role]. Would you like to change your name to something else?", "Name change",oldname) as text
-			if((world.time-time_passed)>300)
+			newname = input(src,"You are \a [role]. Would you like to change your name to something else?", "Name change",oldname) as text
+			if((world.time-time_passed)>3000)
 				return	//took too long
 			newname = reject_bad_name(newname,allow_numbers)	//returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
 

From a60921326ef7c6be397cd80017817c6b9e93c9d0 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 00:06:28 -0400
Subject: [PATCH 02/11] Adjusts ammunition autolathe costs, makes 7.62 mags
 printable

---
 code/game/machinery/autolathe_datums.dm        |  8 +++++++-
 code/modules/projectiles/ammunition/boxes.dm   | 12 ++++++++++++
 code/modules/projectiles/ammunition/bullets.dm | 13 +++++++------
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm
index b3193ac73eb..522b58744b1 100644
--- a/code/game/machinery/autolathe_datums.dm
+++ b/code/game/machinery/autolathe_datums.dm
@@ -322,6 +322,12 @@
 	hidden = 1
 	category = "Arms and Ammunition"
 
+/datum/autolathe/recipe/magazine_arifle
+	name = "ammunition (7.62mm)"
+	path = /obj/item/ammo_magazine/c762
+	hidden = 1
+	category = "Arms and Ammunition"
+
 /datum/autolathe/recipe/magazine_smg
 	name = "ammunition (9mm top mounted)"
 	path = /obj/item/ammo_magazine/mc9mmt
@@ -329,7 +335,7 @@
 	category = "Arms and Ammunition"
 
 /datum/autolathe/recipe/magazine_carbine
-	name = "ammunition (5.56)"
+	name = "ammunition (5.56mm)"
 	path = /obj/item/ammo_magazine/a556
 	hidden = 1
 	category = "Arms and Ammunition"
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index be30717c478..e25d8f39f14 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -6,6 +6,7 @@
 	icon_state = "T38"
 	caliber = "357"
 	ammo_type = /obj/item/ammo_casing/a357
+	matter = list("metal" = 1260)
 	max_ammo = 7
 	multiple_sprites = 1
 
@@ -13,6 +14,7 @@
 	name = "speed loader (.38)"
 	icon_state = "38"
 	caliber = "38"
+	matter = list("metal" = 360)
 	ammo_type = /obj/item/ammo_casing/c38
 	max_ammo = 6
 	multiple_sprites = 1
@@ -26,6 +28,7 @@
 	icon_state = "45"
 	mag_type = MAGAZINE
 	ammo_type = /obj/item/ammo_casing/c45
+	matter = list("metal" = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
 	caliber = ".45"
 	max_ammo = 7
 	multiple_sprites = 1
@@ -46,6 +49,7 @@
 	icon_state = "9x19p"
 	origin_tech = "combat=2"
 	mag_type = MAGAZINE
+	matter = list("metal" = 600)
 	caliber = "9mm"
 	ammo_type = /obj/item/ammo_casing/c9mm
 	max_ammo = 10
@@ -61,6 +65,7 @@
 	name = "ammunition Box (9mm)"
 	icon_state = "9mm"
 	origin_tech = "combat=2"
+	matter = list("metal" = 1800)
 	caliber = "9mm"
 	ammo_type = /obj/item/ammo_casing/c9mm
 	max_ammo = 30
@@ -73,6 +78,7 @@
 	icon_state = "9mmt"
 	mag_type = MAGAZINE
 	ammo_type = /obj/item/ammo_casing/c9mm
+	matter = list("metal" = 1200)
 	caliber = "9mm"
 	max_ammo = 20
 	multiple_sprites = 1
@@ -89,6 +95,7 @@
 	icon_state = "9mm"
 	origin_tech = "combat=2"
 	caliber = ".45"
+	matter = list("metal" = 2250)
 	ammo_type = /obj/item/ammo_casing/c45
 	max_ammo = 30
 
@@ -101,6 +108,7 @@
 	origin_tech = "combat=2"
 	mag_type = MAGAZINE
 	caliber = "12mm"
+	matter = list("metal" = 1500)
 	ammo_type = "/obj/item/ammo_casing/a12mm"
 	max_ammo = 20
 	multiple_sprites = 1
@@ -114,6 +122,7 @@
 	origin_tech = "combat=2"
 	mag_type = MAGAZINE
 	caliber = "a556"
+	matter = list("metal" = 1800)
 	ammo_type = /obj/item/ammo_casing/a556
 	max_ammo = 10
 	multiple_sprites = 1
@@ -127,6 +136,7 @@
 	origin_tech = "combat=2"
 	mag_type = MAGAZINE
 	caliber = ".50"
+	matter = list("metal" = 1260)
 	ammo_type = /obj/item/ammo_casing/a50
 	max_ammo = 7
 	multiple_sprites = 1
@@ -152,6 +162,7 @@
 	origin_tech = "combat=2"
 	mag_type = MAGAZINE
 	caliber = "a762"
+	matter = list("metal" = 4500)
 	ammo_type = /obj/item/ammo_casing/a762
 	max_ammo = 50
 	multiple_sprites = 1
@@ -164,6 +175,7 @@
 	icon_state = "c762"
 	mag_type = MAGAZINE
 	caliber = "a762"
+	matter = list("metal" = 1800)
 	ammo_type = /obj/item/ammo_casing/a762
 	max_ammo = 20
 	multiple_sprites = 1
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index f0a406e467b..931555381ac 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -66,28 +66,28 @@
 	icon_state = "slshell"
 	caliber = "shotgun"
 	projectile_type = /obj/item/projectile/bullet/shotgun
-	matter = list("metal" = 12500)
+	matter = list("metal" = 360)
 
 /obj/item/ammo_casing/shotgun/pellet
 	name = "shotgun shell"
 	desc = "A 12 gauge shell."
 	icon_state = "gshell"
 	projectile_type = /obj/item/projectile/bullet/pellet/shotgun
-	matter = list("metal" = 12500)
+	matter = list("metal" = 360)
 
 /obj/item/ammo_casing/shotgun/blank
 	name = "shotgun shell"
 	desc = "A blank shell."
 	icon_state = "blshell"
 	projectile_type = /obj/item/projectile/bullet/blank
-	matter = list("metal" = 250)
+	matter = list("metal" = 90)
 
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag shell"
 	desc = "A beanbag shell."
 	icon_state = "bshell"
 	projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
-	matter = list("metal" = 500)
+	matter = list("metal" = 180)
 
 //Can stun in one hit if aimed at the head, but
 //is blocked by clothing that stops tasers and is vulnerable to EMP
@@ -97,7 +97,7 @@
 	icon_state = "stunshell"
 	spent_icon = "stunshell-spent"
 	projectile_type = /obj/item/projectile/energy/electrode/stunshot
-	matter = list("metal" = 1250, "glass" = 1250)
+	matter = list("metal" = 360, "glass" = 720)
 
 /obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
 	if(prob(100/severity)) BB = null
@@ -109,7 +109,7 @@
 	desc = "A chemical shell used to signal distress or provide illumination."
 	icon_state = "fshell"
 	projectile_type = /obj/item/projectile/energy/flash/flare
-	matter = list("metal" = 250, "glass" = 250)
+	matter = list("metal" = 90, "glass" = 90)
 
 /obj/item/ammo_casing/a762
 	desc = "A 7.62mm bullet casing."
@@ -123,6 +123,7 @@
 	spent_icon = "lcasing-spent"
 	caliber = "14.5mm"
 	projectile_type = /obj/item/projectile/bullet/rifle/a145
+	matter = list("metal" = 1250)
 
 /obj/item/ammo_casing/a556
 	desc = "A 5.56mm bullet casing."

From 8ff15108f95fe966462ba87307dc8c54a8f8304d Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 00:16:48 -0400
Subject: [PATCH 03/11] Reduces 14.5mm ammo box cost to 2 TC, slight rename

---
 code/game/gamemodes/game_mode.dm                   | 4 ++--
 code/modules/projectiles/guns/projectile/sniper.dm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 0ce94aabac6..79d8c2657cb 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -36,7 +36,7 @@
 			new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, ".357", "RA"),
 			new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "9mm", "R9"),
 			new/datum/uplink_item(/obj/item/ammo_magazine/chemdart, 2, "Darts", "AD"),
-			new/datum/uplink_item(/obj/item/weapon/storage/box/sniperammo, 4, "14.5mm", "SA")
+			new/datum/uplink_item(/obj/item/weapon/storage/box/sniperammo, 2, "14.5mm", "SA")
 			),
 		"Highly Visible and Dangerous Weapons" = list(
 			 new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"),
@@ -47,7 +47,7 @@
 			 new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"),
 			 new/datum/uplink_item(/obj/item/weapon/gun/projectile/revolver, 6, "Revolver", "RE"),
 			 new/datum/uplink_item(/obj/item/weapon/storage/box/syndicate, 10, "Mercenary Bundle", "BU"),
-			 new/datum/uplink_item(/obj/item/weapon/gun/projectile/heavysniper, 12, "PTRS Rifle", "BU")
+			 new/datum/uplink_item(/obj/item/weapon/gun/projectile/heavysniper, 12, "Antimaterial Rifle", "BU")
 			),
 		"Stealthy and Inconspicuous Weapons" = list(
 			new/datum/uplink_item(/obj/item/weapon/soap/syndie, 1, "Subversive Soap", "SP"),
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 29250cc6feb..6c14edfaa55 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -1,5 +1,5 @@
 /obj/item/weapon/gun/projectile/heavysniper
-	name = "\improper PTRS-7 rifle"
+	name = "\improper PTR-7 rifle"
 	desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
 	icon_state = "heavysniper"
 	item_state = "l6closednomag" //placeholder

From 28df26b36c00aad389338ad0e78d192f4ed373b3 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 02:34:17 -0400
Subject: [PATCH 04/11] Reduces the effect of EMP on robot power cells

Temporary fix to resolve #8454
---
 code/modules/mob/living/silicon/robot/drone/drone.dm | 1 +
 code/modules/mob/living/silicon/robot/robot.dm       | 2 ++
 code/modules/power/cell.dm                           | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 9d2af7af567..0fcdc108752 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -5,6 +5,7 @@
 	icon_state = "repairbot"
 	maxHealth = 35
 	health = 35
+	cell_emp_mult = 1
 	universal_speak = 0
 	universal_understand = 1
 	gender = NEUTER
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3647352aab1..fd324f2c6e7 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -50,6 +50,8 @@ var/list/robot_verbs_default = list(
 	var/obj/item/weapon/cell/cell = null
 	var/obj/machinery/camera/camera = null
 
+	var/cell_emp_mult = 2
+
 	// Components are basically robot organs.
 	var/list/components = list()
 
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 69f0b92a485..b919658bbab 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -128,6 +128,11 @@
 		rigged = 1 //broken batterys are dangerous
 
 /obj/item/weapon/cell/emp_act(severity)
+	//remove this once emp changes on dev are merged in
+	if(isrobot(loc))
+        var/mob/living/silicon/robot/R = loc
+        severity *= R.cell_emp_mult
+
 	charge -= maxcharge / severity
 	if (charge < 0)
 		charge = 0

From ceaa938b89b8f183da8705a6aa794a60840a3b5e Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 02:47:05 -0400
Subject: [PATCH 05/11] EMP deals burn instead of brute to silicons, and
 bypasses robot armour

---
 code/modules/mob/living/living.dm                     |  2 +-
 .../mob/living/silicon/robot/drone/drone_damage.dm    |  2 +-
 code/modules/mob/living/silicon/robot/robot_damage.dm | 11 ++++++-----
 code/modules/mob/living/silicon/silicon.dm            |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 8995183db90..13bc98a0dea 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -241,7 +241,7 @@
 	src.updatehealth()
 
 // damage ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/take_organ_damage(var/brute, var/burn)
+/mob/living/proc/take_organ_damage(var/brute, var/burn, var/emp=0)
 	if(status_flags & GODMODE)	return 0	//godmode
 	adjustBruteLoss(brute)
 	adjustFireLoss(burn)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
index 57ffc898873..37731dd3452 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
@@ -11,7 +11,7 @@
 	if(bruteloss<0) bruteloss = 0
 	if(fireloss<0) fireloss = 0
 
-/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0)
+/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/emp = 0)
 	take_overall_damage(brute,burn)
 
 /mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn)
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index e0ebe671f19..5b204a2d04c 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -62,7 +62,7 @@
 	var/datum/robot_component/picked = pick(parts)
 	picked.heal_damage(brute,burn)
 
-/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0)
+/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0)
 	var/list/components = get_damageable_components()
 	if(!components.len)
 		return
@@ -84,10 +84,11 @@
 			burn -= absorb_burn
 			src << "\red Your shield absorbs some of the impact!"
 
-	var/datum/robot_component/armour/A = get_armour()
-	if(A)
-		A.take_damage(brute,burn,sharp,edge)
-		return
+	if(!emp)
+		var/datum/robot_component/armour/A = get_armour()
+		if(A)
+			A.take_damage(brute,burn,sharp,edge)
+			return
 
 	var/datum/robot_component/C = pick(components)
 	C.take_damage(brute,burn,sharp,edge)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 466e984350e..b5041666973 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -56,10 +56,10 @@
 /mob/living/silicon/emp_act(severity)
 	switch(severity)
 		if(1)
-			src.take_organ_damage(20)
+			src.take_organ_damage(0,20,emp=1)
 			Stun(rand(5,10))
 		if(2)
-			src.take_organ_damage(10)
+			src.take_organ_damage(0,10,emp=1)
 			Stun(rand(1,5))
 	flick("noise", src:flash)
 	src << "\red <B>*BZZZT*</B>"

From dc1f05a9da1d70cf1197454b0d3e97d7ef87e86d Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 02:49:34 -0400
Subject: [PATCH 06/11] Tweaks rig emp effect, breach_threshold

---
 code/modules/clothing/spacesuits/rig/rig.dm         | 2 +-
 code/modules/clothing/spacesuits/rig/rig_pieces.dm  | 6 +++---
 code/modules/clothing/spacesuits/rig/suits/light.dm | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index d003d64d599..f0de341cf65 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -720,7 +720,7 @@
 	else
 		//Want this to be roughly independant of the number of modules, meaning that X emp hits will disable Y% of the suit's modules on average.
 		//that way people designing hardsuits don't have to worry (as much) about how adding that extra module will affect emp resiliance by 'soaking' hits for other modules
-		chance = max(0, damage - emp_protection)*min(installed_modules.len/15, 1)
+		chance = 2*max(0, damage - emp_protection)*min(installed_modules.len/15, 1)
 
 	if(!prob(chance))
 		return
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index 7f0291c0383..294644f3cba 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -39,9 +39,9 @@
 	flags_inv =          HIDEJUMPSUIT|HIDETAIL
 	flags =              STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
 	slowdown = 0
-	//will reach 10 breach damage after 18 laser carbine blasts, or 7 revolver hits. Completely immune to smg hits.
-	breach_threshold = 28
-	resilience = 0.05
+	//will reach 10 breach damage after 25 laser carbine blasts, 3 revolver hits, or ~1 PTR hit. Completely immune to smg or sts hits.
+	breach_threshold = 38
+	resilience = 0.2
 	can_breach = 1
 	sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi')
 	supporting_limbs = list()
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index 55442c0a02b..e07aa904521 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -20,7 +20,6 @@
 /obj/item/clothing/suit/space/rig/light
 	name = "suit"
 	breach_threshold = 18 //comparable to voidsuits
-	resilience = 0.2
 
 /obj/item/clothing/gloves/rig/light
 	name = "gloves"
@@ -82,8 +81,7 @@
 	..()
 
 /obj/item/clothing/suit/space/rig/light/ninja
-	breach_threshold = 28 //comparable to regular hardsuits
-	resilience = 0.05
+	breach_threshold = 38 //comparable to regular hardsuits
 
 /obj/item/weapon/rig/light/stealth
 	name = "stealth suit control module"

From f8eb5ccb97b946a35aa8a35335b5a61d45607fd9 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 13:04:39 -0400
Subject: [PATCH 07/11] indent fix

---
 code/modules/power/cell.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index b919658bbab..55c78538d6c 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -130,8 +130,8 @@
 /obj/item/weapon/cell/emp_act(severity)
 	//remove this once emp changes on dev are merged in
 	if(isrobot(loc))
-        var/mob/living/silicon/robot/R = loc
-        severity *= R.cell_emp_mult
+		var/mob/living/silicon/robot/R = loc
+		severity *= R.cell_emp_mult
 
 	charge -= maxcharge / severity
 	if (charge < 0)

From 113498dc1e51cd84caa041fe6bb063b27b0ce97e Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Tue, 24 Mar 2015 03:57:17 -0400
Subject: [PATCH 08/11] Makes bread tube nutriment content similar to
 comparable snacks

---
 code/modules/reagents/reagent_containers/food/snacks.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 502a741c6b4..266b2b75547 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -3016,7 +3016,7 @@
 
 	New()
 		..()
-		reagents.add_reagent("nutriment", 12)
+		reagents.add_reagent("nutriment", 6)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks

From 1ce81b91b15ffb32920013b333c6e1e0c5abda8c Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Tue, 24 Mar 2015 04:03:06 -0400
Subject: [PATCH 09/11] Adds bread tube trash item

---
 code/game/objects/items/trash.dm              |   4 ++++
 .../reagent_containers/food/snacks.dm         |   5 +++--
 icons/obj/trash.dmi                           | Bin 4054 -> 9014 bytes
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index e8bae92fee2..34181486e49 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -68,5 +68,9 @@
 	name = "\improper \"LiquidFood\" ration"
 	icon_state = "liquidfood"
 
+/obj/item/trash/tastybread
+	name = "bread tube"
+	icon_state = "tastybread"
+
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
 	return
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 266b2b75547..11963e15f76 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -3009,9 +3009,10 @@
 
 
 /obj/item/weapon/reagent_containers/food/snacks/tastybread
-	name = "Bread Tube"
-	desc = "Chewy...and surprisingly tasty."
+	name = "bread tube"
+	desc = "Bread in a tube. Chewy...and surprisingly tasty."
 	icon_state = "tastybread"
+	trash = /obj/item/trash/tastybread
 	filling_color = "#A66829"
 
 	New()
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index 1b50bfaeaa0c3f743d98f6683856005ad7a0793e..18b34ee20c237e5a15267a64503f38fa277d1fde 100644
GIT binary patch
literal 9014
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

literal 4054
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
IM6N<$f>F(^asU7T


From 5d006467b302be47323aaf39cf617e6063dd950b Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Tue, 24 Mar 2015 04:10:04 -0400
Subject: [PATCH 10/11] Fixes merc shuttle cigarette machine, adds some rations
 so the mercs don't go hungry.

Fixes merc shuttle cigarette machine requiring credits that the mercs can pay (having no accounts). Adds 4 liquidfood rations and 4 bread tubes to the merc shuttle lockers.
---
 maps/exodus-2.dmm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/maps/exodus-2.dmm b/maps/exodus-2.dmm
index fa74e7fc1e7..c5b91182597 100644
--- a/maps/exodus-2.dmm
+++ b/maps/exodus-2.dmm
@@ -802,7 +802,7 @@
 "pv" = (/obj/item/device/multitool,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/reinforced{icon_state = "table"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "pw" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/reinforced{icon_state = "table"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
 "px" = (/obj/machinery/door/window{dir = 1; name = "Cell"; req_access_txt = "150"},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
-"py" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVent"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4)},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
+"py" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4)},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "pz" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/syndicate_station/start)
 "pA" = (/obj/machinery/door/airlock/external{frequency = 1331; icon_state = "door_closed"; id_tag = "synd_inner"; locked = 0; name = "Ship External Access"; req_access = null; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "pB" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
@@ -890,7 +890,7 @@
 "rf" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "rg" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "rh" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom)
-"ri" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list()},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/syndicate_mothership)
+"ri" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/syndicate_mothership)
 "rj" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/syndicate_station/start)
 "rk" = (/obj/structure/table,/obj/item/weapon/screwdriver,/obj/effect/spawner/newbomb/timer/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "rl" = (/obj/machinery/vending/snack{name = "hacked Getmore Chocolate Corp"; prices = list()},/turf/unsimulated/floor{tag = "icon-cult"; name = "plating"; icon_state = "cult"},/area/syndicate_mothership)
@@ -1972,8 +1972,10 @@
 "LV" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north/shuttlespace_ns11,/area/space)
 "LW" = (/obj/structure/table/rack,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/maneuvering_jets,/obj/item/rig_module/maneuvering_jets,/obj/item/rig_module/grenade_launcher,/obj/item/rig_module/device/drill,/obj/item/rig_module/device/drill,/obj/item/rig_module/device/healthscanner,/obj/item/rig_module/device/healthscanner,/obj/item/rig_module/device/plasmacutter,/obj/item/rig_module/device/plasmacutter,/obj/item/rig_module/device/rcd,/obj/item/rig_module/device/rcd,/obj/item/rig_module/chem_dispenser/injector,/obj/item/rig_module/chem_dispenser/injector,/obj/item/rig_module/chem_dispenser/combat,/obj/item/rig_module/chem_dispenser/combat,/obj/item/rig_module/mounted/egun,/obj/item/rig_module/mounted/egun,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom)
 "LX" = (/obj/structure/table/reinforced,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom)
+"LY" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
+"LZ" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
+"Ma" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "MA" = (/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space/transit/north/shuttlespace_ns12,/area/space)
-"MO" = (/obj/machinery/vending/cigarette{contraband = newlist(); premium = newlist(); prices = list(/obj/item/weapon/storage/fancy/cigarettes = 15, /obj/item/weapon/storage/box/matches = 1, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 20); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/syndicate_station/start)
 "MP" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
 "MQ" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
 "MR" = (/obj/machinery/hologram/holopad,/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)
@@ -2146,12 +2148,12 @@ aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaM
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMomnHonnHnHnHnHnHooaMnTnananUihkdkdkdihkTkTnVnWihcikQrcihmumumumumumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnHoGoyoaounFnHaMaMaMaMaMaMobkdkdkdoclalaododihcikQrcihmumumumumumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnHoBoAoanRornHaMaMaMaMaMaMoikdkdkdihojlaihihihokolokihihihihmumumumumumumu
-aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnvnHoBoyoanRornHnzaMaMmPmKoFihkdkdkdihihihihnOnOkQkQkQnPnPpKihihmumumumumumu
-aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnvnHnHnHnHvLoyoanRornHnHnHnHnzototihkdkdkdkdihnYnXkQkQkQkQkQkQkQkQqKihmumumumumumu
+aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnvnHoBoyoanRLYnHnzaMaMmPmKoFihkdkdkdihihihihnOnOkQkQkQnPnPpKihihmumumumumumu
+aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnvnHnHnHnHvLoyoanRLZnHnHnHnHnzototihkdkdkdkdihnYnXkQkQkQkQkQkQkQkQqKihmumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMnHpioXoYnHnRoHnRoJnHnHoZoOpbrTkRpnkRkdkdkdkdoCkQkQkQkQkQoDkQkQkQkQoxihmumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMaMmumuaMaMaMaMphoWpjoWnHnHnHpknHnHpJoZplpmrTkRpLkRkdkdkdkdihoqopkQkQkQkQkQkQkQkQoMihmumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNoNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMaMmumumuaMaMaMaMnHnHphpxnHnHnRnRpynHnHpzpApznHoIoIihoPnanUihihihihowovkQkQkQozozoeihihmumumumumumu
-aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMoToUoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMmumumumuaMaMaMaMnHMOnRnRpHnHnRnRnRnHrbsordpInHmBaMmBaMaMaMaMmumuihihihokpcokihihihihmumumumumumumu
+aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMoToUoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoVoNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMmumumumuaMaMaMaMnHManRnRpHnHnRnRnRnHrbsordpInHmBaMmBaMaMaMaMmumuihihihokpcokihihihihmumumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMoToUoVoVoVpdpepepepepfpfpepepepepgoVoVoVoVoNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMaMmumumumuaMaMaMaMnHqanRnRnRqbnRnRnRqcnRnRnRqdnHmKmKmKmKaMaMaMaMmumumuihoEkQoEihmumumumumumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMoToUoVoVpdpppqprpspeptpupepvpwpepepepgoVoVoNaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMmumumumumuaMaMaMaMnHqCnRnRnRqDnRnRnRqEnRnRnRqFnHaMaMaMaMaMaMaMaMaMmumuihoEkQoEihmumumumumumumumumumu
 aMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMoToUoVpdpepBpBpBpBpepCpCpepBpBpDpEpepepgoVpFpFpFpFpFaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMaMmtaMaMaMaMaMaMaMaMaMmumumumuaMaMaMaMnvnHnHnHnHnHnHnRnRnRnHnHnHnHnHnHnzaMaMaMaMaMmAaMmBmumuihoEkQoEihmumumumumumumumumumu

From b39a486e618c6491bc9a8ff3590f53b296586ad6 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Wed, 25 Mar 2015 21:07:13 +0100
Subject: [PATCH 11/11] Fixes duplicate uplink reference.

This is the second time I have to fix it for the rifle. Stop breaking it.
---
 code/game/gamemodes/game_mode.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 79d8c2657cb..d5db1a31aee 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -47,7 +47,7 @@
 			 new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"),
 			 new/datum/uplink_item(/obj/item/weapon/gun/projectile/revolver, 6, "Revolver", "RE"),
 			 new/datum/uplink_item(/obj/item/weapon/storage/box/syndicate, 10, "Mercenary Bundle", "BU"),
-			 new/datum/uplink_item(/obj/item/weapon/gun/projectile/heavysniper, 12, "Antimaterial Rifle", "BU")
+			 new/datum/uplink_item(/obj/item/weapon/gun/projectile/heavysniper, 12, "Anti-materiel Rifle", "AMR")
 			),
 		"Stealthy and Inconspicuous Weapons" = list(
 			new/datum/uplink_item(/obj/item/weapon/soap/syndie, 1, "Subversive Soap", "SP"),