From 3590262ed263f267e67b6875ed4028e54622113e Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sun, 22 Nov 2015 12:19:35 -0500
Subject: [PATCH] Minor bugfix patch

---
 code/modules/mob/living/carbon/human/life.dm  |  2 ++
 .../modules/mob/living/silicon/robot/robot.dm | 27 ++++++++++++-------
 .../mob/living/silicon/robot/robot_modules.dm |  2 ++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 19e9f144744..155cb7ab376 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1492,6 +1492,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					holder.icon_state = "hudcargonia"
 				if("People's Republic of Commandzakstan")
 					holder.icon_state = "hudcommand"
+				if("Servicion")
+					holder.icon_state = "hudservice"
 				if("Medistan")
 					holder.icon_state = "hudmedistan"
 				if("Scientopia")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 21692df44dc..a2f83fc218e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -220,6 +220,8 @@ var/list/robot_verbs_default = list(
 	if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
+	if(get_nations_mode())
+		modules = list("Peacekeeper")
 	if(mmi != null && mmi.alien)
 		modules = "Hunter"
 	modtype = input("Please, select a module!", "Robot", null, null) in modules
@@ -297,6 +299,11 @@ var/list/robot_verbs_default = list(
 			module.channels = list("Security" = 1)
 			module_sprites["Combat Android"] = "droidcombat"
 
+		if("Peacekeeper")
+			module= new /obj/item/weapon/robot_module/peacekeeper(src)
+			module.channels = list()
+			module_sprites["Peacekeeper Android"] = "droidpeace"
+
 		if("Hunter")
 			updatename(module)
 			module = new /obj/item/weapon/robot_module/alien/hunter(src)
@@ -1001,10 +1008,7 @@ var/list/robot_verbs_default = list(
 		else
 			overlays += "ov-openpanel -c"
 
-	if(activated(/obj/item/borg/combat/shield))
-		overlays += "[icon_state]-shield"
-
-	if(modtype == "Combat")
+	if(modtype == ("Combat" || "Peacekeeper"))
 		if (base_icon == "")
 			base_icon = icon_state
 		if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
@@ -1012,6 +1016,9 @@ var/list/robot_verbs_default = list(
 		else
 			icon_state = base_icon
 
+	if(activated(/obj/item/borg/combat/shield))
+		overlays += "[icon_state]-shield"
+
 	if(jetpackoverlay)
 		overlays += "minerjetpack-[icon_state]"
 	update_fire()
@@ -1413,10 +1420,11 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/combat/New()
 	..()
-	var/module_sprites[0] //Used to store the associations between sprite names and sprite index.
 	module = new /obj/item/weapon/robot_module/combat(src)
 	module.channels = list("Security" = 1)
-	module_sprites["Combat Android"] = "droidcombat"
+	base_icon = "droidcombat"
+	icon_state = "droidcombat"
+	modtype = "Combat"
 	//languages
 	module.add_languages(src)
 	//subsystems
@@ -1427,16 +1435,16 @@ var/list/robot_verbs_default = list(
 
 	status_flags &= ~CANPUSH
 
-	choose_icon(6,module_sprites)
 	radio.config(module.channels)
 	notify_ai(2)
 
 
 /mob/living/silicon/robot/peacekeeper/New()
 	..()
-	var/module_sprites[0] //Used to store the associations between sprite names and sprite index.
 	module = new /obj/item/weapon/robot_module/peacekeeper(src)
-	module_sprites["Peacekeeper Android"] = "droidpeace"
+	base_icon = "droidpeace"
+	icon_state = "droidpeace"
+	modtype = "Peacekeeper"
 	//languages
 	module.add_languages(src)
 	//subsystems
@@ -1447,5 +1455,4 @@ var/list/robot_verbs_default = list(
 
 	status_flags &= ~CANPUSH
 
-	choose_icon(6,module_sprites)
 	notify_ai(2)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 314e7332c72..9191ebbfa13 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -418,6 +418,7 @@
 	src.modules += new /obj/item/weapon/pickaxe/drill/jackhammer(src)
 	src.modules += new /obj/item/borg/combat/shield(src)
 	src.modules += new /obj/item/borg/combat/mobility(src)
+	src.modules += new /obj/item/weapon/wrench(src)
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
 
 	fix_modules()
@@ -432,6 +433,7 @@
 	src.modules += new /obj/item/weapon/pickaxe/drill/jackhammer(src)
 	src.modules += new /obj/item/borg/combat/shield(src)
 	src.modules += new /obj/item/borg/combat/mobility(src)
+	src.modules += new /obj/item/weapon/wrench(src)
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
 
 	fix_modules()