Merge branch 'master' into upstream-merge-27669

code/game/objects/items/devices/PDA/PDA.dm

@@ -632,7 +632,14 @@ GLOBAL_LIST_EMPTY(PDAs)
 		L = get(src, /mob/living/silicon)
 
 	if(L && L.stat != UNCONSCIOUS)
-		to_chat(L, "\icon[src] <b>Message from [source.owner] ([source.ownjob]), </b>\"[msg.message]\"[msg.get_photo_ref()] (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[source]'>Reply</a>)")
+
+		var/hrefstart
+		var/hrefend
+		if (isAI(L))
+			hrefstart = "<a href='?src=\ref[L];track=[html_encode(source.owner)]'>"
+			hrefend = "</a>"
+
+		to_chat(L, "\icon[src.icon] <b>Message from [hrefstart][source.owner] ([source.ownjob])[hrefend], </b>\"[msg.message]\"[msg.get_photo_ref()] (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[source]'>Reply</a>)")
 
 	update_icon()
 	add_overlay(icon_alert)
@@ -890,9 +897,9 @@ GLOBAL_LIST_EMPTY(PDAs)
 	if(T)
 		T.hotspot_expose(700,125)
 		if(istype(cartridge, /obj/item/weapon/cartridge/syndicate))
-			explosion(T, -1, 1, 3, 4)
+			explosion(T, -1, 1, 3, 4)
 		else
-			explosion(T, -1, -1, 2, 3)
+			explosion(T, -1, -1, 2, 3)
 	qdel(src)
 	return
 

code/game/objects/items/devices/paicard.dm

@@ -10,15 +10,14 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
 
 /obj/item/device/paicard/Initialize()
-	..()
 	SSpai.pai_card_list += src
 	add_overlay("pai-off")
+	return ..()
 
 /obj/item/device/paicard/Destroy()
 	//Will stop people throwing friend pAIs into the singularity so they can respawn
 	SSpai.pai_card_list -= src
-	if(!isnull(pai))
-		pai.death(0)
+	QDEL_NULL(pai)
 	return ..()
 
 /obj/item/device/paicard/attack_self(mob/user)
@@ -26,9 +25,9 @@
 		return
 	user.set_machine(src)
 	var/dat = "<TT><B>Personal AI Device</B><BR>"
-	if(pai && (!pai.master_dna || !pai.master))
-		dat += "<a href='byond://?src=\ref[src];setdna=1'>Imprint Master DNA</a><br>"
 	if(pai)
+		if(!pai.master_dna || !pai.master)
+			dat += "<a href='byond://?src=\ref[src];setdna=1'>Imprint Master DNA</a><br>"
 		dat += "Installed Personality: [pai.name]<br>"
 		dat += "Prime directive: <br>[pai.laws.zeroth]<br>"
 		for(var/slaws in pai.laws.supplied)
@@ -86,7 +85,7 @@
 					to_chat(pai, "<span class='danger'>Byte by byte you lose your sense of self.</span>")
 					to_chat(pai, "<span class='userdanger'>Your mental faculties leave you.</span>")
 					to_chat(pai, "<span class='rose'>oblivion... </span>")
-					pai.death(0)
+					removePersonality()
 		if(href_list["wires"])
 			var/wire = text2num(href_list["wires"])
 			if(pai.radio)
@@ -119,9 +118,9 @@
 	audible_message("\The [src] plays a cheerful startup noise!")
 
 /obj/item/device/paicard/proc/removePersonality()
-	src.pai = null
-	src.cut_overlays()
-	src.add_overlay("pai-off")
+	QDEL_NULL(pai)
+	cut_overlays()
+	add_overlay("pai-off")
 
 /obj/item/device/paicard/proc/setEmotion(emotion)
 	if(pai)

code/game/objects/items/devices/powersink.dm

@@ -141,5 +141,5 @@
 
 	if(power_drained >= max_power)
 		STOP_PROCESSING(SSobj, src)
-		explosion(src.loc, 4,8,16,32)
+		explosion(src.loc, 4,8,16,32)
 		qdel(src)

code/game/objects/items/robot/robot_items.dm

@@ -504,6 +504,8 @@
 		S.change_head_color(color2)
 		dropped = TRUE
 
+#define PKBORG_DAMPEN_CYCLE_DELAY 20
+
 //Peacekeeper Cyborg Projectile Dampenening Field
 /obj/item/borg/projectile_dampen
 	name = "Hyperkinetic Dampening projector"
@@ -526,6 +528,7 @@
 	var/image/projectile_effect
 	var/field_radius = 3
 	var/active = FALSE
+	var/cycle_delay = 0
 
 /obj/item/borg/projectile_dampen/debug
 	maxenergy = 50000
@@ -545,29 +548,31 @@
 	return ..()
 
 /obj/item/borg/projectile_dampen/attack_self(mob/user)
-	if(!istype(dampening_field))
-		activate_field()
-		active = TRUE
+	if(cycle_delay > world.time)
+		to_chat(user, "<span class='boldwarning'>\the [src] is still recycling its projectors!</span>")
+		return
+	cycle_delay = world.time + PKBORG_DAMPEN_CYCLE_DELAY
+	active = !active
+	if(active)
+		activate_field(user)
 	else
 		deactivate_field()
-		active = FALSE
+	update_icon()
 	to_chat(user, "<span class='boldnotice'>You [active? "activate":"deactivate"] the [src].</span>")
 
 /obj/item/borg/projectile_dampen/update_icon()
-	. = ..()
 	icon_state = "[initial(icon_state)][active]"
 
 /obj/item/borg/projectile_dampen/proc/activate_field()
-	if(!istype(dampening_field))
-		dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))
-	update_icon()
+	if(istype(dampening_field))
+		QDEL_NULL(dampening_field)
+	dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))
 
 /obj/item/borg/projectile_dampen/proc/deactivate_field()
 	QDEL_NULL(dampening_field)
-	visible_message("<span class='warning'>The [src] shuts off!</span>")
-	for(var/obj/item/projectile/P in tracked)
+	visible_message("<span class='warning'>\The [src] shuts off!</span>")
+	for(var/P in tracked)
 		restore_projectile(P)
-	update_icon()
 
 /obj/item/borg/projectile_dampen/dropped()
 	. = ..()

code/game/objects/items/weapons/cards_ids.dm

@@ -83,6 +83,14 @@
 	var/list/access = list()
 	var/registered_name = null // The name registered_name on the card
 	var/assignment = null
+	var/access_txt // mapping aid
+
+
+
+/obj/item/weapon/card/id/Initialize(mapload)
+	. = ..()
+	if(mapload && access_txt)
+		access = text2access(access_txt)
 
 /obj/item/weapon/card/id/attack_self(mob/user)
 	user.visible_message("<span class='notice'>[user] shows you: \icon[src] [src.name].</span>", \

code/game/objects/items/weapons/chrono_eraser.dm

@@ -54,10 +54,10 @@
 	var/obj/effect/chrono_field/field = null
 	var/turf/startpos = null
 
-/obj/item/weapon/gun/energy/chrono_gun/New(var/obj/item/weapon/chrono_eraser/T)
+/obj/item/weapon/gun/energy/chrono_gun/Initialize()
 	. = ..()
-	if(istype(T))
-		TED = T
+	if(istype(loc, /obj/item/weapon/chrono_eraser))
+		TED = loc
 	else //admin must have spawned it
 		TED = new(src.loc)
 		qdel(src)

code/game/objects/items/weapons/cigs_lighters.dm

@@ -622,6 +622,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon = 'icons/obj/clothing/masks.dmi'
 	icon_state = null
 	item_state = null
+	w_class = WEIGHT_CLASS_TINY
 	var/chem_volume = 100
 	var/vapetime = 0 //this so it won't puff out clouds every tick
 	var/screw = 0 // kinky
@@ -633,8 +634,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	return (TOXLOSS|OXYLOSS)
 
 
-/obj/item/clothing/mask/vape/New(loc, var/param_color = null)
-	..()
+/obj/item/clothing/mask/vape/Initialize(mapload, param_color)
+	. = ..()
 	create_reagents(chem_volume)
 	reagents.set_reacting(FALSE) // so it doesn't react until you light it
 	reagents.add_reagent("nicotine", 50)

code/game/objects/items/weapons/defib.dm

@@ -23,14 +23,14 @@
 	var/combat = 0 //can we revive through space suits?
 	var/grab_ghost = FALSE // Do we pull the ghost back into their body?
 
-/obj/item/weapon/defibrillator/New() //starts without a cell for rnd
-	..()
+/obj/item/weapon/defibrillator/Initialize() //starts without a cell for rnd
+	. = ..()
 	paddles = make_paddles()
 	update_icon()
 	return
 
-/obj/item/weapon/defibrillator/loaded/New() //starts with hicap
-	..()
+/obj/item/weapon/defibrillator/loaded/Initialize() //starts with hicap
+	. = ..()
 	paddles = make_paddles()
 	bcell = new(src)
 	update_icon()
@@ -237,8 +237,8 @@
 	if(slot == user.getBeltSlot())
 		return 1
 
-/obj/item/weapon/defibrillator/compact/loaded/New()
-	..()
+/obj/item/weapon/defibrillator/compact/loaded/Initialize()
+	. = ..()
 	paddles = make_paddles()
 	bcell = new(src)
 	update_icon()
@@ -249,8 +249,8 @@
 	combat = 1
 	safety = 0
 
-/obj/item/weapon/defibrillator/compact/combat/loaded/New()
-	..()
+/obj/item/weapon/defibrillator/compact/combat/loaded/Initialize()
+	. = ..()
 	paddles = make_paddles()
 	bcell = new /obj/item/weapon/stock_parts/cell/infinite(src)
 	update_icon()

code/game/objects/items/weapons/flamethrower.dm

@@ -14,14 +14,16 @@
 	origin_tech = "combat=1;plasmatech=2;engineering=2"
 	resistance_flags = FIRE_PROOF
 	var/status = 0
-	var/throw_amount = 100
 	var/lit = 0	//on or off
 	var/operating = 0//cooldown
 	var/obj/item/weapon/weldingtool/weldtool = null
 	var/obj/item/device/assembly/igniter/igniter = null
 	var/obj/item/weapon/tank/internals/plasma/ptank = null
 	var/warned_admins = 0 //for the message_admins() when lit
-
+	//variables for prebuilt flamethrowers
+	var/create_full = FALSE
+	var/create_with_tank = FALSE
+	var/igniter_type = /obj/item/device/assembly/igniter 
 
 /obj/item/weapon/flamethrower/Destroy()
 	if(weldtool)
@@ -32,9 +34,8 @@
 		qdel(ptank)
 	return ..()
 
-
 /obj/item/weapon/flamethrower/process()
-	if(!lit)
+	if(!lit || !igniter)
 		STOP_PROCESSING(SSobj, src)
 		return null
 	var/turf/location = loc
@@ -43,8 +44,7 @@
 		if(M.is_holding(src))
 			location = M.loc
 	if(isturf(location)) //start a fire if possible
-		location.hotspot_expose(700, 2)
-	return
+		igniter.flamethrower_process(location)
 
 
 /obj/item/weapon/flamethrower/update_icon()
@@ -58,6 +58,9 @@
 		item_state = "flamethrower_1"
 	else
 		item_state = "flamethrower_0"
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_hands()
 	return
 
 /obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, flag)
@@ -82,13 +85,13 @@
 	if(istype(W, /obj/item/weapon/wrench) && !status)//Taking this apart
 		var/turf/T = get_turf(src)
 		if(weldtool)
-			weldtool.loc = T
+			weldtool.forceMove(T)
 			weldtool = null
 		if(igniter)
-			igniter.loc = T
+			igniter.forceMove(T)
 			igniter = null
 		if(ptank)
-			ptank.loc = T
+			ptank.forceMove(T)
 			ptank = null
 		new /obj/item/stack/rods(T)
 		qdel(src)
@@ -114,7 +117,10 @@
 
 	else if(istype(W,/obj/item/weapon/tank/internals/plasma))
 		if(ptank)
-			to_chat(user, "<span class='notice'>There is already a plasma tank loaded in [src]!</span>")
+			if(user.transferItemToLoc(W,src))
+				ptank.forceMove(get_turf(src))
+				ptank = W
+				to_chat(user, "<span class='notice'>You swap the plasma tank in [src]!</span>")
 			return
 		if(!user.transferItemToLoc(W, src))
 			return
@@ -129,53 +135,26 @@
 
 
 /obj/item/weapon/flamethrower/attack_self(mob/user)
-	if(user.stat || user.restrained() || user.lying)
-		return
-	user.set_machine(src)
+	toggle_igniter(user)
+
+
+/obj/item/weapon/flamethrower/proc/toggle_igniter(mob/user)
 	if(!ptank)
 		to_chat(user, "<span class='notice'>Attach a plasma tank first!</span>")
 		return
-	var/dat = text("<TT><B>Flamethrower (<A HREF='?src=\ref[src];light=1'>[lit ? "<font color='red'>Lit</font>" : "Unlit"]</a>)</B><BR>\n Tank Pressure: [ptank.air_contents.return_pressure()]<BR>\nAmount to throw: <A HREF='?src=\ref[src];amount=-100'>-</A> <A HREF='?src=\ref[src];amount=-10'>-</A> <A HREF='?src=\ref[src];amount=-1'>-</A> [throw_amount] <A HREF='?src=\ref[src];amount=1'>+</A> <A HREF='?src=\ref[src];amount=10'>+</A> <A HREF='?src=\ref[src];amount=100'>+</A><BR>\n<A HREF='?src=\ref[src];remove=1'>Remove plasmatank</A> - <A HREF='?src=\ref[src];close=1'>Close</A></TT>")
-	user << browse(dat, "window=flamethrower;size=600x300")
-	onclose(user, "flamethrower")
-	return
-
-
-/obj/item/weapon/flamethrower/Topic(href,href_list[])
-	if(href_list["close"])
-		usr.unset_machine()
-		usr << browse(null, "window=flamethrower")
+	if(!status)
+		to_chat(user, "<span class='notice'>Secure the igniter first!</span>")
 		return
-	if(usr.stat || usr.restrained() || usr.lying)
-		return
-	usr.set_machine(src)
-	if(href_list["light"])
-		if(!ptank)
-			return
-		if(!status)
-			return
-		lit = !lit
-		if(lit)
-			START_PROCESSING(SSobj, src)
-			if(!warned_admins)
-				message_admins("[ADMIN_LOOKUPFLW(usr)] has lit a flamethrower.")
-				warned_admins = 1
-	if(href_list["amount"])
-		throw_amount = throw_amount + text2num(href_list["amount"])
-		throw_amount = max(50, min(5000, throw_amount))
-	if(href_list["remove"])
-		if(!ptank)
-			return
-		usr.put_in_hands(ptank)
-		ptank = null
-		lit = 0
-		usr.unset_machine()
-		usr << browse(null, "window=flamethrower")
-	for(var/mob/M in viewers(1, loc))
-		if((M.client && M.machine == src))
-			attack_self(M)
+	to_chat(user, "<span class='notice'>You ignite [src]!</span>")
+	lit = !lit
+	if(lit)
+		START_PROCESSING(SSobj, src)
+		if(!warned_admins)
+			message_admins("[ADMIN_LOOKUPFLW(user)] has lit a flamethrower.")
+			warned_admins = 1
+	else
+		STOP_PROCESSING(SSobj,src)
 	update_icon()
-	return
 
 /obj/item/weapon/flamethrower/CheckParts(list/parts_list)
 	..()
@@ -195,19 +174,22 @@
 	for(var/turf/T in turflist)
 		if(T == previousturf)
 			continue	//so we don't burn the tile we be standin on
-		if(!T.atmos_adjacent_turfs || !T.atmos_adjacent_turfs[previousturf])
+		var/list/turfs_sharing_with_prev = previousturf.GetAtmosAdjacentTurfs(alldir=1)
+		if(!(T in turfs_sharing_with_prev))
 			break
-		ignite_turf(T)
+		if(igniter)
+			igniter.ignite_turf(src,T)
+		else
+			default_ignite(T)
 		sleep(1)
 		previousturf = T
 	operating = 0
 	for(var/mob/M in viewers(1, loc))
 		if((M.client && M.machine == src))
 			attack_self(M)
-	return
 
 
-/obj/item/weapon/flamethrower/proc/ignite_turf(turf/target, release_amount = 0.05)
+/obj/item/weapon/flamethrower/proc/default_ignite(turf/target, release_amount = 0.05)
 	//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
 	//Transfer 5% of current tank air contents to turf
 	var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
@@ -218,30 +200,42 @@
 	target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500)
 	//location.hotspot_expose(1000,500,1)
 	SSair.add_to_active(target, 0)
-	return
 
 
-/obj/item/weapon/flamethrower/full/New(var/loc)
-	..()
-	if(!weldtool)
-		weldtool = new /obj/item/weapon/weldingtool(src)
-	weldtool.status = 0
-	if(!igniter)
-		igniter = new /obj/item/device/assembly/igniter(src)
-	igniter.secured = 0
-	status = 1
-	update_icon()
+/obj/item/weapon/flamethrower/Initialize(mapload)
+	. = ..()
+	if(create_full)
+		if(!weldtool)
+			weldtool = new /obj/item/weapon/weldingtool(src)
+		weldtool.status = 0
+		if(!igniter)
+			igniter = new igniter_type(src)
+		igniter.secured = 0
+		status = 1
+		if(create_with_tank)
+			ptank = new /obj/item/weapon/tank/internals/plasma/full(src)
+		update_icon()
 
-/obj/item/weapon/flamethrower/full/tank/New(var/loc)
-	..()
-	ptank = new /obj/item/weapon/tank/internals/plasma/full(src)
-	update_icon()
+/obj/item/weapon/flamethrower/full/tank
+	create_full = TRUE
 
+/obj/item/weapon/flamethrower/full/tank
+	create_with_tank = TRUE
 
 /obj/item/weapon/flamethrower/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
 	if(ptank && damage && attack_type == PROJECTILE_ATTACK && prob(15))
 		owner.visible_message("<span class='danger'>[attack_text] hits the fueltank on [owner]'s [src], rupturing it! What a shot!</span>")
 		var/target_turf = get_turf(owner)
-		ignite_turf(target_turf, 100)
+		igniter.ignite_turf(src,target_turf, release_amount = 100)
 		qdel(ptank)
 		return 1 //It hit the flamethrower, not them
+
+
+/obj/item/device/assembly/igniter/proc/flamethrower_process(turf/open/location)
+	location.hotspot_expose(700,2)
+
+/obj/item/device/assembly/igniter/cold/flamethrower_process(turf/open/location)
+	return
+
+/obj/item/device/assembly/igniter/proc/ignite_turf(obj/item/weapon/flamethrower/F,turf/open/location,release_amount = 0.05)
+	F.default_ignite(location,release_amount)

code/game/objects/items/weapons/grenades/ghettobomb.dm

@@ -59,7 +59,7 @@
 
 /obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up
 	update_mob()
-	explosion(src.loc,-1,-1,2, flame_range = 4)	// small explosion, plus a very large fireball.
+	explosion(src.loc,-1,-1,2, flame_range = 4)	// small explosion, plus a very large fireball.
 	qdel(src)
 
 /obj/item/weapon/grenade/iedcasing/examine(mob/user)

code/game/objects/items/weapons/grenades/plastic.dm

@@ -235,7 +235,7 @@
 
 	to_chat(user, "<span class='notice'>You start planting the bomb...</span>")
 
-	if(do_after(user, 50, target = AM))
+	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM

code/game/objects/items/weapons/grenades/syndieminibomb.dm

@@ -9,7 +9,7 @@
 
 /obj/item/weapon/grenade/syndieminibomb/prime()
 	update_mob()
-	explosion(src.loc,1,2,4,flame_range = 2)
+	explosion(src.loc,1,2,4,flame_range = 2)
 	qdel(src)
 
 /obj/item/weapon/grenade/syndieminibomb/concussion
@@ -20,7 +20,7 @@
 
 /obj/item/weapon/grenade/syndieminibomb/concussion/prime()
 	update_mob()
-	explosion(src.loc,0,2,3,flame_range = 3)
+	explosion(src.loc,0,2,3,flame_range = 3)
 	qdel(src)
 
 /obj/item/weapon/grenade/syndieminibomb/concussion/frag

code/game/objects/items/weapons/kitchen.dm

@@ -65,6 +65,7 @@
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharpness = IS_SHARP_ACCURATE
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
+	var/bayonet = FALSE	//Can this be attached to a gun?
 
 /obj/item/weapon/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user)
 	if(user.zone_selected == "eyes")
@@ -107,7 +108,7 @@
 	throwforce = 20
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
-
+	bayonet = TRUE
 
 /obj/item/weapon/kitchen/knife/combat/survival
 	name = "survival knife"
@@ -115,6 +116,7 @@
 	desc = "A hunting grade survival knife."
 	force = 15
 	throwforce = 15
+	bayonet = TRUE
 
 /obj/item/weapon/kitchen/knife/combat/bone
 	name = "bone dagger"

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -270,4 +270,4 @@
 
 /obj/item/weapon/pneumatic_cannon/pie/selfcharge/process()
 	if(++charge_tick >= charge_ticks)
-		fill_with_type(/obj/item/weapon/reagent_containers/food/snacks/pie, charge_amount)
+		fill_with_type(/obj/item/weapon/reagent_containers/food/snacks/pie/cream, charge_amount)

code/game/objects/items/weapons/storage/backpack.dm

@@ -83,7 +83,7 @@
 
 /obj/item/weapon/storage/backpack/holding/singularity_act(current_size)
 	var/dist = max((current_size - 2),1)
-	explosion(src.loc,(dist),(dist*2),(dist*4))
+	explosion(src.loc,(dist),(dist*2),(dist*4))
 	return
 
 

code/game/objects/items/weapons/stunbaton.dm

@@ -21,10 +21,9 @@
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (FIRELOSS)
 
-/obj/item/weapon/melee/baton/New()
-	..()
+/obj/item/weapon/melee/baton/Initialize()
+	. = ..()
 	update_icon()
-	return
 
 /obj/item/weapon/melee/baton/throw_impact(atom/hit_atom)
 	..()
@@ -32,10 +31,9 @@
 	if(status && prob(throw_hit_chance) && iscarbon(hit_atom))
 		baton_stun(hit_atom)
 
-/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
-	..()
+/obj/item/weapon/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
 	bcell = new(src)
-	update_icon()
+	. = ..()
 
 /obj/item/weapon/melee/baton/proc/deductcharge(chrgdeductamt)
 	if(bcell)
@@ -188,8 +186,8 @@
 	slot_flags = SLOT_BACK
 	var/obj/item/device/assembly/igniter/sparkler = 0
 
-/obj/item/weapon/melee/baton/cattleprod/New()
-	..()
+/obj/item/weapon/melee/baton/cattleprod/Initialize()
+	. = ..()
 	sparkler = new (src)
 
 /obj/item/weapon/melee/baton/cattleprod/baton_stun()

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -140,7 +140,7 @@
 	item_state = "plasmaman_tank_belt"
 	slot_flags = SLOT_BELT
 	force = 5
-	volume = 3
+	volume = 6
 	w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
 
 /obj/item/weapon/tank/internals/plasmaman/belt/full/New()