Merge pull request #4194 from Mechoid/Welderpack_Tanks

Adds a mounted welder to the welderpacks in Engineering.

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

@@ -656,6 +656,61 @@
 		nextrefueltick = world.time + 10
 		reagents.add_reagent("fuel", 1)
 
+/*
+ * Backpack Welder.
+ */
+
+/obj/item/weapon/weldingtool/tubefed
+	name = "tube-fed welding tool"
+	desc = "A bulky, cooler-burning welding tool that draws from a worn welding tank."
+	icon_state = "tubewelder"
+	max_fuel = 10
+	w_class = ITEMSIZE_NO_CONTAINER
+	matter = null
+	toolspeed = 1.25
+	change_icons = 0
+	flame_intensity = 1
+	eye_safety_modifier = 1
+	always_process = TRUE
+	var/obj/item/weapon/weldpack/mounted_pack = null
+
+/obj/item/weapon/weldingtool/tubefed/New(location)
+	..()
+	if(istype(location, /obj/item/weapon/weldpack))
+		var/obj/item/weapon/weldpack/holder = location
+		mounted_pack = holder
+	else
+		qdel(src)
+
+/obj/item/weapon/weldingtool/tubefed/Destroy()
+	mounted_pack.nozzle = null
+	mounted_pack = null
+	return ..()
+
+/obj/item/weapon/weldingtool/tubefed/process()
+	if(mounted_pack)
+		if(!istype(mounted_pack.loc,/mob/living/carbon/human))
+			mounted_pack.return_nozzle()
+		else
+			var/mob/living/carbon/human/H = mounted_pack.loc
+			if(H.back != mounted_pack)
+				mounted_pack.return_nozzle()
+
+	if(mounted_pack.loc != src.loc && src.loc != mounted_pack)
+		mounted_pack.return_nozzle()
+		visible_message("<span class='notice'>\The [src] retracts to its fueltank.</span>")
+
+	if(get_fuel() <= get_max_fuel())
+		mounted_pack.reagents.trans_to_obj(src, 1)
+
+	..()
+
+/obj/item/weapon/weldingtool/tubefed/dropped(mob/user)
+	..()
+	if(src.loc != user)
+		mounted_pack.return_nozzle()
+		to_chat(user, "<span class='notice'>\The [src] retracts to its fueltank.</span>")
+
 /*
  * Electric/Arc Welder
  */

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

@@ -6,46 +6,140 @@
 	icon_state = "welderpack"
 	w_class = ITEMSIZE_LARGE
 	var/max_fuel = 350
+	var/obj/item/weapon/nozzle = null //Attached welder, or other spray device.
+	var/nozzle_attached = 0
 
 /obj/item/weapon/weldpack/New()
 	var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
 	reagents = R
 	R.my_atom = src
 	R.add_reagent("fuel", max_fuel)
+	nozzle = new/obj/item/weapon/weldingtool/tubefed(src)
+	nozzle_attached = 1
+
+/obj/item/weapon/weldpack/Destroy()
+	qdel(nozzle)
+	nozzle = null
+	return ..()
+
+/obj/item/weapon/weldpack/dropped(mob/user)
+	..()
+	if(nozzle)
+		user.remove_from_mob(nozzle)
+		return_nozzle()
+		to_chat(user, "<span class='notice'>\The [nozzle] retracts to its fueltank.</span>")
+
+/obj/item/weapon/weldpack/proc/get_nozzle(var/mob/living/user)
+	if(!ishuman(user))
+		return 0
+
+	var/mob/living/carbon/human/H = user
+
+	if(H.hands_are_full()) //Make sure our hands aren't full.
+		to_chat(H, "<span class='warning'>Your hands are full.  Drop something first.</span>")
+		return 0
+
+	var/obj/item/weapon/F = nozzle
+	H.put_in_hands(F)
+	nozzle_attached = 0
+
+	return 1
+
+/obj/item/weapon/weldpack/proc/return_nozzle(var/mob/living/user)
+	nozzle.forceMove(src)
+	nozzle_attached = 1
 
 /obj/item/weapon/weldpack/attackby(obj/item/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/weldingtool))
+	if(istype(W, /obj/item/weapon/weldingtool) && !(W == nozzle))
 		var/obj/item/weapon/weldingtool/T = W
 		if(T.welding & prob(50))
 			message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
 			log_game("[key_name(user)] triggered a fueltank explosion.")
-			user << "<span class='danger'>That was stupid of you.</span>"
+			to_chat(user,"<span class='danger'>That was stupid of you.</span>")
 			explosion(get_turf(src),-1,0,2)
 			if(src)
 				qdel(src)
 			return
-		else
+		else if(T.status)
 			if(T.welding)
-				user << "<span class='danger'>That was close!</span>"
+				to_chat(user,"<span class='danger'>That was close!</span>")
 			src.reagents.trans_to_obj(W, T.max_fuel)
-			user << "<span class='notice'>Welder refilled!</span>"
+			to_chat(user, "<span class='notice'>Welder refilled!</span>")
 			playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 			return
-	user << "<span class='warning'>The tank scoffs at your insolence. It only provides services to welders.</span>"
+	else if(nozzle)
+		if(nozzle == W)
+			if(!user.unEquip(W))
+				to_chat(user,"<span class='notice'>\The [W] seems to be stuck to your hand.</span>")
+				return
+			if(!nozzle_attached)
+				return_nozzle()
+				to_chat(user,"<span class='notice'>You attach \the [W] to the [src].</span>")
+				return
+		else
+			to_chat(user,"<span class='notice'>The [src] already has a nozzle!</span>")
+	else
+		to_chat(user,"<span class='warning'>The tank scoffs at your insolence. It only provides services to welders.</span>")
 	return
 
+/obj/item/weapon/weldpack/attack_hand(mob/user as mob)
+	if(istype(user, /mob/living/carbon/human))
+		var/mob/living/carbon/human/wearer = user
+		if(wearer.back == src)
+			if(nozzle && nozzle_attached)
+				if(!wearer.incapacitated())
+					get_nozzle(user)
+			else
+				to_chat(user,"<span class='notice'>\The [src] does not have a nozzle attached!</span>")
+		else
+			..()
+	else
+		..()
+
 /obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity)
 	if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously
 		return
 	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel)
 		O.reagents.trans_to_obj(src, max_fuel)
-		user << "<span class='notice'>You crack the cap off the top of the pack and fill it back up again from the tank.</span>"
+		to_chat(user,"<span class='notice'>You crack the cap off the top of the pack and fill it back up again from the tank.</span>")
 		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return
 	else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel)
-		user << "<span class='warning'>The pack is already full!</span>"
+		to_chat(user,"<span class='warning'>The pack is already full!</span>")
 		return
 
+/obj/item/weapon/weldpack/MouseDrop(obj/over_object as obj) //This is terrifying.
+	if(!canremove)
+		return
+
+	if (ishuman(usr) || issmall(usr)) //so monkeys can take off their backpacks -- Urist
+
+		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why?
+			return
+
+		if (!( istype(over_object, /obj/screen) ))
+			return ..()
+
+		//makes sure that the thing is equipped, so that we can't drag it into our hand from miles away.
+		//there's got to be a better way of doing this.
+		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+			return
+
+		if (( usr.restrained() ) || ( usr.stat ))
+			return
+
+		if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src))
+			return
+
+		switch(over_object.name)
+			if("r_hand")
+				usr.u_equip(src)
+				usr.put_in_r_hand(src)
+			if("l_hand")
+				usr.u_equip(src)
+				usr.put_in_l_hand(src)
+		src.add_fingerprint(usr)
+
 /obj/item/weapon/weldpack/examine(mob/user)
 	..(user)
 	user << text("\icon[] [] units of fuel left!", src, src.reagents.total_volume)