Merge branch 'master' into upstream-merge-37476

code/modules/projectiles/guns/misc/beam_rifle.dm

@@ -58,7 +58,7 @@
 	var/projectile_damage = 30
 	var/projectile_stun = 0
 	var/projectile_setting_pierce = TRUE
-	var/delay = 65
+	var/delay = 25
 	var/lastfire = 0
 
 	//ZOOMING
@@ -82,7 +82,7 @@
 	cell_type = /obj/item/stock_parts/cell/infinite
 	aiming_time = 0
 	recoil = 0
-	pin = /obj/item/device/firing_pin
+	pin = /obj/item/firing_pin
 
 /obj/item/gun/energy/beam_rifle/equipped(mob/user)
 	set_user(user)
@@ -182,6 +182,7 @@
 
 /obj/item/gun/energy/beam_rifle/Initialize()
 	. = ..()
+	fire_delay = delay
 	current_tracers = list()
 	START_PROCESSING(SSprojectiles, src)
 	zoom_lock_action = new(src)

code/modules/projectiles/guns/misc/blastcannon.dm

@@ -11,7 +11,7 @@
 	clumsy_check = FALSE
 	randomspread = FALSE
 
-	var/obj/item/device/transfer_valve/bomb
+	var/obj/item/transfer_valve/bomb
 
 /obj/item/gun/blastcannon/Initialize()
 	. = ..()
@@ -19,9 +19,7 @@
 		pin = new
 
 /obj/item/gun/blastcannon/Destroy()
-	if(bomb)
-		qdel(bomb)
-		bomb = null
+	QDEL_NULL(bomb)
 	return ..()
 
 /obj/item/gun/blastcannon/attack_self(mob/user)
@@ -44,44 +42,44 @@
 		desc = initial(desc)
 
 /obj/item/gun/blastcannon/attackby(obj/O, mob/user)
-	if(istype(O, /obj/item/device/transfer_valve))
-		var/obj/item/device/transfer_valve/T = O
+	if(istype(O, /obj/item/transfer_valve))
+		var/obj/item/transfer_valve/T = O
 		if(!T.tank_one || !T.tank_two)
 			to_chat(user, "<span class='warning'>What good would an incomplete bomb do?</span>")
 			return FALSE
-		if(!user.transferItemToLoc(O, src))
-			to_chat(user, "<span class='warning'>[O] seems to be stuck to your hand!</span>")
+		if(!user.transferItemToLoc(T, src))
+			to_chat(user, "<span class='warning'>[T] seems to be stuck to your hand!</span>")
 			return FALSE
-		user.visible_message("<span class='warning'>[user] attaches [O] to [src]!</span>")
-		bomb = O
+		user.visible_message("<span class='warning'>[user] attaches [T] to [src]!</span>")
+		bomb = T
 		update_icon()
 		return TRUE
 	return ..()
 
 /obj/item/gun/blastcannon/proc/calculate_bomb()
-	if(!istype(bomb)||!istype(bomb.tank_one)||!istype(bomb.tank_two))
+	if(!istype(bomb) || !istype(bomb.tank_one) || !istype(bomb.tank_two))
 		return 0
 	var/datum/gas_mixture/temp = new(60)	//directional buff.
 	temp.merge(bomb.tank_one.air_contents.remove_ratio(1))
 	temp.merge(bomb.tank_two.air_contents.remove_ratio(2))
 	for(var/i in 1 to 6)
-		temp.react()
+		temp.react(src)
 	var/pressure = temp.return_pressure()
 	qdel(temp)
 	if(pressure < TANK_FRAGMENT_PRESSURE)
 		return 0
-	return (pressure/TANK_FRAGMENT_SCALE)
+	return (pressure / TANK_FRAGMENT_SCALE)
 
 /obj/item/gun/blastcannon/afterattack(atom/target, mob/user, flag, params)
 	if((!bomb) || (!target) || (get_dist(get_turf(target), get_turf(user)) <= 2))
 		return ..()
 	var/power = calculate_bomb()
-	qdel(bomb)
+	QDEL_NULL(bomb)
 	update_icon()
 	var/heavy = power * 0.2
 	var/medium = power * 0.5
 	var/light = power
-	user.visible_message("<span class='danger'>[user] opens \the [bomb] on \his [name] and fires a blast wave at \the [target]!</span>","<span class='danger'>You open \the [bomb] on your [name] and fire a blast wave at \the [target]!</span>")
+	user.visible_message("<span class='danger'>[user] opens [bomb] on [user.p_their()] [name] and fires a blast wave at [target]!</span>","<span class='danger'>You open [bomb] on your [name] and fire a blast wave at [target]!</span>")
 	playsound(user, "explosion", 100, 1)
 	var/turf/starting = get_turf(user)
 	var/turf/targturf = get_turf(target)
@@ -111,17 +109,21 @@
 
 /obj/item/projectile/blastwave/Range()
 	..()
+	var/amount_destruction = EXPLODE_NONE
 	if(heavyr)
-		loc.ex_act(EXPLODE_DEVASTATE)
+		amount_destruction = EXPLODE_DEVASTATE
 	else if(mediumr)
-		loc.ex_act(EXPLODE_HEAVY)
+		amount_destruction = EXPLODE_HEAVY
 	else if(lightr)
-		loc.ex_act(EXPLODE_LIGHT)
+		amount_destruction = EXPLODE_LIGHT
+	if(amount_destruction)
+		loc.ex_act(amount_destruction)
 	else
 		qdel(src)
-	heavyr--
-	mediumr--
-	lightr--
+
+	heavyr = max(heavyr - 1, 0)
+	mediumr = max(mediumr - 1, 0)
+	lightr = max(lightr - 1, 0)
 
 /obj/item/projectile/blastwave/ex_act()
-	return
+	return

code/modules/projectiles/guns/misc/medbeam.dm

@@ -116,6 +116,8 @@
 		new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
 	target.adjustBruteLoss(-4)
 	target.adjustFireLoss(-4)
+	target.adjustToxLoss(-1)
+	target.adjustOxyLoss(-1)
 	return
 
 /obj/item/gun/medbeam/proc/on_beam_release(var/mob/living/target)