Merge branch 'master' into upstream-merge-14247

code/modules/projectiles/ammunition/zz_autolathe_ch.dm

@@ -38,10 +38,25 @@
 	path = /obj/item/ammo_magazine/a57/rubber
 
 /datum/category_item/autolathe/arms/smg_p90
-	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
+	name = "large capacity top mounted magazine (5.7x28mm standard)"
 	path = /obj/item/ammo_magazine/m9mmp90
 	hidden = 1
 
+/datum/category_item/autolathe/arms/smg_p90/ap
+	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
+	path = /obj/item/ammo_magazine/m9mmp90/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/smg_p90/rubber
+	name = "large capacity top mounted magazine (5.7x28mm rubber)"
+	path = /obj/item/ammo_magazine/m9mmp90/rubber
+	hidden = 1
+
+/datum/category_item/autolathe/arms/smg_p90/hp
+	name = "large capacity top mounted magazine (5.7x28mm hollow-point)"
+	path = /obj/item/ammo_magazine/m9mmp90/hp
+	hidden = 1
+
 /datum/category_item/autolathe/arms/svd_762
 	name = "SVD magazine (7.62x54mmR)"
 	path = /obj/item/ammo_magazine/m762svd
@@ -325,12 +340,12 @@
 	name = "RPK Drum magazine(7.62x39mm standard)"
 	path = /obj/item/ammo_magazine/akm/drum
 	hidden = 1
-	
+
 /datum/category_item/autolathe/arms/s45lc
 	name = "speedloader(.45 LC)"
 	path = /obj/item/ammo_magazine/s45lc
 	hidden = 1
-	
+
 /datum/category_item/autolathe/arms/s45lc/rubber
 	name = "speedloader(.45 LC Rubber)"
 	path = /obj/item/ammo_magazine/s45lc/rubber
@@ -345,4 +360,4 @@
 	name = ".45 LC"
 	path = /obj/item/ammo_casing/a45lc
 	hidden = 1
-	
+

code/modules/projectiles/ammunition/zz_magazines_ch.dm

@@ -1,9 +1,24 @@
 //Overrides
 /obj/item/ammo_magazine/m9mmp90	//congratulations you are now being converted 5.7x28mm, a.k.a the round the p90 actually uses.
-	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"	//Ugh, we'll leave it AP I guess
-	ammo_type = /obj/item/ammo_casing/a57/ap
+	name = "large capacity top mounted magazine (5.7x28mm standard)" //Standard boolet. Cheaper to make.
+	ammo_type = /obj/item/ammo_casing/a57
+	matter = list(MAT_STEEL = 2700)
 	caliber = "5.7x28mm"
 
+/obj/item/ammo_magazine/m9mmp90/hp
+	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a57/ap
+	matter = list(MAT_STEEL = 3000)
+
+/obj/item/ammo_magazine/m9mmp90/rubber
+	name = "large capacity top mounted magazine (5.7x28mm rubber)"
+	ammo_type = /obj/item/ammo_casing/a57/rubber
+
+/obj/item/ammo_magazine/m9mmp90/ap
+	name = "large capacity top mounted magazine (5.7x28mm hollow-point)"
+	ammo_type = /obj/item/ammo_casing/a57/hp
+	matter = list(MAT_STEEL = 3000)
+
 /obj/item/ammo_magazine/m762svd	//You are now being converted to 7.62x54mmR :3
 	name = "\improper SVD magazine (7.62x54mmR)"
 	icon = 'icons/obj/ammo_ch.dmi'

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

@@ -185,7 +185,7 @@
 			break
 		playsound(src,'sound/items/change_drill.ogg',25,1)
 		user.hud_used.update_ammo_hud(user, src)
-		if(power_supply.give(phase_power) < phase_power)
+		if(power_supply.give(phase_power/8) < phase_power/8) //CHOMP Edit: Nerfed charge time of all phasers by adding /8 in a couple spots to this line
 			break
 
 	recharging = 0

code/modules/projectiles/projectile/bullets.dm

@@ -319,6 +319,16 @@
 	vacuum_traversal = 0
 	hud_state = "flame"
 
+/obj/item/projectile/bullet/incendiary/flamethrower/after_move()
+	..()
+
+
+	var/turf/T = get_turf(src)
+	if(istype(T))
+		for(var/obj/effect/plant/Victim in T)
+			if(prob(max(20, 100 - (Victim.seed.get_trait(TRAIT_ENDURANCE)))))	// Chance to immediately kill a vine or rampant growth, minimum of 20%.
+				Victim.die_off()
+
 /obj/item/projectile/bullet/incendiary/flamethrower/large
 	damage = 5
 	incendiary = 3