Merge pull request #406 from SamCroswell/master

ERT Rework

code/modules/admin/verbs/debug.dm

@@ -899,7 +899,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 			M.equip_if_possible(pda, slot_r_store)
 			M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), slot_l_store)
-			M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
+			M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
 
 			var/obj/item/weapon/card/id/centcom/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Captain)"
@@ -964,7 +964,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 
@@ -992,7 +992,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/gloves/color/white(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 
 			var/obj/item/device/pda/centcom/pda = new(M)
@@ -1104,7 +1104,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/cyber(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 
@@ -1130,7 +1130,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_if_possible(new /obj/item/clothing/gloves/color/white(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/matches(M), slot_in_backpack)

code/modules/clothing/spacesuits/ert.dm

@@ -5,6 +5,7 @@
 	item_state = "helm-command"
 	armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
+	rig_restrict_helmet = 0 // ERT helmets can be taken on and off at will.
 	var/obj/machinery/camera/camera
 
 /obj/item/clothing/head/helmet/space/rig/ert/attack_self(mob/user)

code/modules/projectiles/guns/energy/pulse.dm

@@ -16,7 +16,7 @@
 		switch(mode)
 			if(2)
 				mode = 0
-				charge_cost = 100
+				charge_cost = 50
 				fire_sound = 'sound/weapons/Taser.ogg'
 				user << "\red [src.name] is now set to stun."
 				projectile_type = "/obj/item/projectile/energy/electrode"
@@ -57,14 +57,31 @@
 	attack_self(mob/living/user as mob)
 		user << "\red [src.name] has three settings, and they are all DESTROY."
 
-
-
-/obj/item/weapon/gun/energy/pulse_rifle/M1911
-	name = "m1911-P"
-	desc = "It's not the size of the gun, it's the size of the hole it puts through people."
-	icon_state = "m1911-p"
-	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
-	w_class = 3.0
+/obj/item/weapon/gun/energy/pulse_rifle/carbine
+	name = "pulse carbine"
+	desc = "A compact variant of the pulse rifle with less firepower but easier storage."
+	w_class = 3
 	slot_flags = SLOT_BELT
+	icon_state = "pulse_carbine"
+	item_state = "pulse"
+	cell_type = "/obj/item/weapon/stock_parts/cell/pulse/carbine"
+	can_flashlight = 1
+
+
+/obj/item/weapon/gun/energy/pulse_rifle/pistol
+	name = "pulse pistol"
+	desc = "A pulse rifle in an easily concealed handgun package with low capacity."
+	w_class = 2
+	slot_flags = SLOT_BELT
+	icon_state = "pulse_pistol"
+	item_state = "gun"
+	cell_type = "/obj/item/weapon/stock_parts/cell/pulse/pistol"
+
+/obj/item/weapon/gun/energy/pulse_rifle/pistol/m1911
+	name = "\improper M1911-P"
+	desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people."
+	icon_state = "m1911-p"
+	item_state = "gun"
+	cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
 	isHandgun()
 		return 1

code/modules/reagents/Chemistry-Reagents.dm

@@ -1711,6 +1711,12 @@ datum
 				..()
 				return
 
+			nanites
+				name = "Nanites"
+				id = "nanities"
+				description = "Nanomachines that aid in rapid cellular regeneration."
+
+
 		synaptizine
 			name = "Synaptizine"
 			id = "synaptizine"

code/modules/reagents/reagent_containers/hypospray.dm

@@ -68,6 +68,14 @@
 	..()
 	reagents.add_reagent("synaptizine", 30)
 
+/obj/item/weapon/reagent_containers/hypospray/combat/nanites
+	name = "combat stimulant injector"
+	desc = "A modified air-needle autoinjector filled with expensive regeneration nanites."
+	volume = 100
+
+/obj/item/weapon/reagent_containers/hypospray/combat/New()
+	..()
+	reagents.add_reagent("nanites", 70)
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector
 	name = "emergency autoinjector"