Job Changes

code/modules/clothing/gloves/miscellaneous.dm

@@ -4,6 +4,8 @@
 	icon_state = "captain"
 	item_state = "egloves"
 	_color = "captain"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
 	heat_protection = HANDS

code/modules/clothing/head/jobs.dm

@@ -10,7 +10,7 @@
 	siemens_coefficient = 0.9
 	loose = 35 // why-a do people always push-a me over
 
-//Captain: This probably shouldn't be space-worthy
+//Captain
 /obj/item/clothing/head/caphat
 	name = "captain's hat"
 	icon_state = "captain"
@@ -18,8 +18,15 @@
 	flags = FPRINT|TABLEPASS
 	item_state = "caphat"
 	siemens_coefficient = 0.9
+	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	loose = 43 // not the answer
 
+//Captain: no longer space-worthy
+/obj/item/clothing/head/caphat/parade
+	name = "captain's parade cap"
+	desc = "Worn only by Captains with an abundance of class."
+	icon_state = "capcap"
+
 //Captain: This probably shouldn't be space-worthy
 /obj/item/clothing/head/helmet/cap
 	name = "captain's cap"
@@ -32,6 +39,16 @@
 	siemens_coefficient = 0.9
 	loose = 17
 
+//Head of Personnel
+/obj/item/clothing/head/hopcap
+	name = "head of personnel's cap"
+	icon_state = "hopcap"
+	desc = "The symbol of true bureaucratic micromanagement."
+	flags = FPRINT|TABLEPASS
+	siemens_coefficient = 0.9
+	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+	loose = 43 // not the answer
+
 //Chaplain
 /obj/item/clothing/head/chaplain_hood
 	name = "chaplain's hood"

code/modules/clothing/suits/armor.dm

@@ -1,6 +1,6 @@
 
 /obj/item/clothing/suit/armor
-	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/telebaton)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	flags = FPRINT | TABLEPASS
 
@@ -32,6 +32,13 @@
 	icon_state = "warden_jacket"
 	item_state = "armor"
 
+/obj/item/clothing/suit/armor/vest/capcarapace
+	name = "captain's carapace"
+	desc = "An armored vest reinforced with ceramic plates and pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
+	icon_state = "capcarapace"
+	item_state = "armor"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	armor = list(melee = 50, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/riot
 	name = "Riot Suit"

code/modules/mob/living/carbon/human/human_defense.dm

@@ -21,7 +21,7 @@ emp_act
 				var/turf/curloc = get_turf(src)
 
 				// redirect the projectile
-				P.firer = src				
+				P.firer = src
 				P.original = locate(new_x, new_y, P.z)
 				P.starting = curloc
 				P.current = curloc
@@ -173,6 +173,8 @@ emp_act
 			if(!turfs.len) turfs += pick(/turf in orange(6))
 			var/turf/picked = pick(turfs)
 			if(!isturf(picked)) return
+			if(buckled)
+				buckled.unbuckle()
 			src.loc = picked
 			return 1
 	if(species.flags & HAS_CHITTIN && (prob(50 - round(damage / 3))))

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -228,7 +228,7 @@
 
 
 	New()
-		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flashlight/seclite(src)
 		src.modules += new /obj/item/device/flash(src)
 		src.modules += new /obj/item/borg/sight/hud/sec(src)
 		src.modules += new /obj/item/weapon/handcuffs/cyborg(src)