Cell Changes and other Stuff

code/modules/admin/verbs/debug.dm

@@ -872,7 +872,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(M), slot_belt)
+			M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt)
 
 			var/obj/item/weapon/card/id/centcom/W = new(M)
 			W.name = "[M.real_name]'s ID Card"

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

@@ -154,44 +154,13 @@
 			if(w_uniform)
 				w_uniform.add_fingerprint(M)
 			var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
-
-			if (istype(r_hand,/obj/item/weapon/gun) || istype(l_hand,/obj/item/weapon/gun))
-				var/obj/item/weapon/gun/W = null
-				var/chance = 0
-
-				if (istype(l_hand,/obj/item/weapon/gun))
-					W = l_hand
-					chance = hand ? 40 : 20
-
-				if (istype(r_hand,/obj/item/weapon/gun))
-					W = r_hand
-					chance = !hand ? 40 : 20
-
-				if (prob(chance))
-					visible_message("<spawn class=danger>[src]'s [W] goes off during struggle!")
-					var/list/turfs = list()
-					for(var/turf/T in view())
-						turfs += T
-					var/turf/target = pick(turfs)
-					return W.afterattack(target,src)
-
 			var/randn = rand(1, 100)
-
-			if(!src.handcuffed)  // Bone White - disarm knockdown only occurs if you have an aggressive grab on the target,  Longer duration (8) to allow handcuffing.
-				//check for an aggressive grab
-				for (var/obj/item/weapon/grab/G in src.grabbed_by)
-					if (G.assailant == M && G.state >= GRAB_AGGRESSIVE)
-						randn -= 30  // this value is the % chance of knockdown if you disarm someone whilst you have an aggressive grab.
-			else
-			//if target is handcuffed, always push them over
-				randn = 0
-
-			if (randn <= 0)
-				apply_effect(4, WEAKEN, run_armor_check(affecting, "melee")) // first var here is the length of the knockdown
+			if (randn <= 25)
+				apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
 				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-				visible_message("\red <B>[M] has floored [src]!</B>")
-				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Floored [src.name] ([src.ckey])</font>")
-				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been floored by [M.name] ([M.ckey])</font>")
+				visible_message("\red <B>[M] has pushed [src]!</B>")
+				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Pushed [src.name] ([src.ckey])</font>")
+				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been pushed by [M.name] ([M.ckey])</font>")
 				if(!iscarbon(M))
 					LAssailant = null
 				else
@@ -199,6 +168,7 @@
 
 				log_attack("[M.name] ([M.ckey]) pushed [src.name] ([src.ckey])")
 				return
+
 			if(randn <= 45 && !lying)
 				if(head)
 					var/obj/item/clothing/head/H = head

code/modules/paperwork/pen.dm

@@ -93,11 +93,12 @@
 
 
 /obj/item/weapon/pen/paralysis/New()
-	var/datum/reagents/R = new/datum/reagents(50)
+	var/datum/reagents/R = new/datum/reagents(55)
 	reagents = R
 	R.my_atom = src
 	R.add_reagent("stoxin", 30)
 	R.add_reagent("mutetoxin", 15)
+	R.add_reagent("tirizene", 10)
 	..()
 	return
 
@@ -108,5 +109,5 @@
 	..()
 	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 	if(reagents.total_volume)
-		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
+		if(M.reagents) reagents.trans_to(M, 55) //used to be 150
 	return

code/modules/power/apc.dm

@@ -54,7 +54,7 @@
 	var/areastring = null
 	var/obj/item/weapon/cell/cell
 	var/start_charge = 90				// initial cell charge %
-	var/cell_type = 5000				// 0=no cell, 1=regular, 2=high-cap (x5) <- old, now it's just 0=no cell, otherwise dictate cellcapacity by changing this value. 1 used to be 1000, 2 was 2500
+	var/cell_type = 2500				// 0=no cell, 1=regular, 2=high-cap (x5) <- old, now it's just 0=no cell, otherwise dictate cellcapacity by changing this value. 1 used to be 1000, 2 was 2500
 	var/opened = 0 //0=closed, 1=opened, 2=cover removed
 	var/shorted = 0
 	var/lighting = 3

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

@@ -4,6 +4,7 @@
 	icon_state = "laser"
 	item_state = "laser"
 	fire_sound = 'sound/weapons/Laser.ogg'
+	charge_cost = 830
 	w_class = 3.0
 	m_amt = 2000
 	origin_tech = "combat=3;magnets=2"
@@ -39,10 +40,10 @@ obj/item/weapon/gun/energy/laser/retro
 
 /obj/item/weapon/gun/energy/laser/captain/process()
 	charge_tick++
-	if(charge_tick < 4) 
+	if(charge_tick < 4)
 		return 0
 	charge_tick = 0
-	if(!power_supply) 
+	if(!power_supply)
 		return 0
 	power_supply.give(1000)
 	update_icon()
@@ -53,7 +54,7 @@ obj/item/weapon/gun/energy/laser/retro
 	desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
 
 /obj/item/weapon/gun/energy/laser/cyborg/process()
-	return 1		
+	return 1
 
 /obj/item/weapon/gun/energy/laser/cyborg/process_chambered()
 	if(in_chamber)
@@ -77,7 +78,6 @@ obj/item/weapon/gun/energy/laser/retro
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	origin_tech = "combat=4;materials=3;powerstorage=3"
 	projectile_type = "/obj/item/projectile/beam/heavylaser"
-	charge_cost = 1250
 
 	isHandgun()
 		return 0
@@ -109,7 +109,7 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser tag gun"
 	icon_state = "bluetag"
 	desc = "Standard issue weapon of the Imperial Guard"
-	projectile_type = "/obj/item/projectile/lastertag/blue"
+	projectile_type = "/obj/item/projectile/lasertag/blue"
 	origin_tech = "combat=1;magnets=2"
 	clumsy_check = 0
 	var/charge_tick = 0
@@ -146,7 +146,7 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser tag gun"
 	icon_state = "redtag"
 	desc = "Standard issue weapon of the Imperial Guard"
-	projectile_type = "/obj/item/projectile/lastertag/red"
+	projectile_type = "/obj/item/projectile/lasertag/red"
 	origin_tech = "combat=1;magnets=2"
 	clumsy_check = 0
 	var/charge_tick = 0

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

@@ -5,7 +5,7 @@
 	item_state = null	//so the human update icon uses the icon_state instead.
 	force = 10
 	fire_sound = 'sound/weapons/pulse.ogg'
-	charge_cost = 2000
+	charge_cost = 200
 	projectile_type = "/obj/item/projectile/beam/pulse"
 	cell_type = "/obj/item/weapon/cell/super"
 	var/mode = 2

code/modules/projectiles/projectile/beams.dm

@@ -35,8 +35,8 @@
 	damage = 60
 	stun = 5
 	weaken = 5
-	stutter = 5	
-	
+	stutter = 5
+
 /obj/item/projectile/beam/xray
 	name = "xray beam"
 	icon_state = "xray"
@@ -75,7 +75,7 @@
 		var/mob/living/carbon/human/M = target
 		if(istype(M.wear_suit))
 			if(M.wear_suit.type in suit_types)
-				M.Weaken(34)
+				M.adjustHalLoss(34)
 	return 1
 
 /obj/item/projectile/lasertag/omni

code/modules/reagents/Chemistry-Reagents.dm

@@ -2079,6 +2079,19 @@ datum
 				M.silent += REM + 1
 				..()
 
+		staminatoxin
+			name = "Tirizene"
+			id = "tirizene"
+			description = "A toxin that affects the stamina of a person when injected into the bloodstream."
+			reagent_state = LIQUID
+			color = "#6E2828"
+			data = 13
+
+			on_mob_life(var/mob/living/M)
+				M.adjustHalLoss(REM * data)
+				data = max(data - 1, 3)
+				..()
+
 		mindbreaker
 			name = "Mindbreaker Toxin"
 			id = "mindbreaker"