Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy

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

@@ -12,6 +12,13 @@
 	var/looking_for_personality = 0
 	var/mob/living/silicon/pai/pai
 
+/obj/item/device/paicard/relaymove(var/mob/user, var/direction)
+	if(user.stat || user.stunned)
+		return
+	var/obj/item/weapon/rig/rig = src.get_rig()
+	if(istype(rig))
+		rig.forced_move(direction, user)
+
 /obj/item/device/paicard/New()
 	..()
 	overlays += "pai-off"

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -39,8 +39,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	null, \
 	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1), \
 	null, \
-	new/datum/stack_recipe("cannon frame", /obj/item/weapon/cannonframe, 10, time = 15, one_per_turf = 0, on_floor = 0), \
-	null, \
 	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
 	new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
 	null, \

code/game/objects/items/trash.dm

@@ -60,6 +60,9 @@
 		name = "chewed gum"
 		desc = "NOT free candy."
 		icon_state = "gum"
+	tastybread
+		name = "bread tube"
+		icon_state = "tastybread"
 
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
 	return

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

@@ -0,0 +1,169 @@
+/obj/item/weapon/pneumatic_cannon
+	name = "pneumatic cannon"
+	desc = "A gas-powered cannon that can fire any object loaded into it."
+	w_class = 4
+	force = 8 //Very heavy
+	attack_verb = list("bludgeoned", "smashed", "beaten")
+	icon = 'icons/obj/pneumaticCannon.dmi'
+	icon_state = "pneumaticCannon"
+	item_state = "bulldog"
+	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+	var/maxWeightClass = 20 //The max weight of items that can fit into the cannon
+	var/loadedWeightClass = 0 //The weight of items currently in the cannon
+	var/obj/item/weapon/tank/tank = null //The gas tank that is drawn from to fire things
+	var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire
+	var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
+	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
+
+
+/obj/item/weapon/pneumatic_cannon/examine(mob/user)
+	..()
+	if(!in_range(user, src))
+		user << "<span class='notice'>You'll need to get closer to see any more.</span>"
+		return
+	for(var/obj/item/I in loadedItems)
+		spawn(0)
+			user << "<span class='info'>\icon [I] It has \the [I] loaded.</span>"
+	if(tank)
+		user << "<span class='notice'>\icon [tank] It has \the [tank] mounted onto it.</span>"
+
+
+/obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params)
+	..()
+	if(istype(W, /obj/item/weapon/tank/) && !tank)
+		if(istype(W, /obj/item/weapon/tank/emergency_oxygen))
+			user << "<span class='warning'>\The [W] is too small for \the [src].</span>"
+			return
+		updateTank(W, 0, user)
+		return
+	if(W.type == type)
+		user << "<span class='warning'>You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.</span>"
+		return
+	if(istype(W, /obj/item/weapon/wrench))
+		switch(pressureSetting)
+			if(1)
+				pressureSetting = 2
+			if(2)
+				pressureSetting = 3
+			if(3)
+				pressureSetting = 1
+		user << "<span class='notice'>You tweak \the [src]'s pressure output to [pressureSetting].</span>"
+		return
+	if(istype(W, /obj/item/weapon/screwdriver) && tank)
+		updateTank(tank, 1, user)
+		return
+	if(loadedWeightClass >= maxWeightClass)
+		user << "<span class='warning'>\The [src] can't hold any more items!</span>"
+		return
+	if(istype(W, /obj/item))
+		var/obj/item/IW = W
+		if((loadedWeightClass + IW.w_class) > maxWeightClass)
+			user << "<span class='warning'>\The [IW] won't fit into \the [src]!</span>"
+			return
+		if(IW.w_class > src.w_class)
+			user << "<span class='warning'>\The [IW] is too large to fit into \the [src]!</span>"
+			return
+		if(!user.unEquip(W))
+			return
+		user << "<span class='notice'>You load \the [IW] into \the [src].</span>"
+		loadedItems.Add(IW)
+		loadedWeightClass += IW.w_class
+		IW.loc = src
+		return
+
+
+/obj/item/weapon/pneumatic_cannon/afterattack(atom/target, mob/living/carbon/human/user, flag, params)
+	if(istype(target, /obj/item/weapon/storage)) //So you can store it in backpacks
+		return ..()
+	if(istype(target, /obj/structure/closet)) //So you can store it in closets
+		return ..()
+	if(istype(target, /obj/structure/rack)) //So you can store it on racks
+		return ..()
+	if(!istype(user))
+		return ..()
+	Fire(user, target)
+
+
+/obj/item/weapon/pneumatic_cannon/proc/Fire(var/mob/living/carbon/human/user, var/atom/target)
+	if(!istype(user) && !target)
+		return
+	var/discharge = 0
+	if(!loadedItems || !loadedWeightClass)
+		user << "<span class='warning'>\The [src] has nothing loaded.</span>"
+		return
+	if(!tank)
+		user << "<span class='warning'>\The [src] can't fire without a source of gas.</span>"
+		return
+	if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting))
+		user << "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>"
+		return
+	if(user && (CLUMSY in user.mutations) && prob(75))
+		user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
+		user.drop_item()
+		if(prob(10))
+			target = get_turf(user)
+		else
+			var/list/possible_targets = range(3,src)
+			target = pick(possible_targets)
+		discharge = 1
+	if(!discharge)
+		user.visible_message("<span class='danger'>[user] fires \the [src]!</span>", \
+				    		 "<span class='danger'>You fire \the [src]!</span>")
+	add_logs(target, user, "fired at", src)
+	playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
+	for(var/obj/item/ITD in loadedItems) //Item To Discharge
+		spawn(0)
+			loadedItems.Remove(ITD)
+			loadedWeightClass -= ITD.w_class
+			ITD.throw_speed = pressureSetting * 2
+			ITD.loc = get_turf(src)
+			ITD.throw_at(target, pressureSetting * 5, pressureSetting * 2,user)
+	if(pressureSetting >= 3 && user)
+		user.visible_message("<span class='warning'>[user] is thrown down by the force of the cannon!</span>", "<span class='userdanger'>[src] slams into your shoulder, knocking you down!")
+		user.Weaken(3)
+
+
+/obj/item/weapon/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity, but smaller
+	name = "improvised pneumatic cannon"
+	desc = "A gas-powered, object-firing cannon made out of common parts."
+	force = 5
+	w_class = 3
+	maxWeightClass = 7
+	gasPerThrow = 5
+
+/datum/table_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but
+	name = "Pneumatic Cannon"
+	result = /obj/item/weapon/pneumatic_cannon/ghetto
+	tools = list(/obj/item/weapon/weldingtool,
+				 /obj/item/weapon/wrench)
+	reqs = list(/obj/item/stack/sheet/metal = 4,
+				/obj/item/stack/packageWrap = 8,
+				/obj/item/pipe = 2)
+	time = 300
+
+/obj/item/weapon/pneumatic_cannon/proc/updateTank(obj/item/weapon/tank/thetank, removing = 0, mob/living/carbon/human/user)
+	if(removing)
+		if(!src.tank)
+			return
+		user << "<span class='notice'>You detach \the [thetank] from \the [src].</span>"
+		src.tank.loc = get_turf(user)
+		user.put_in_hands(tank)
+		src.tank = null
+	if(!removing)
+		if(src.tank)
+			user << "<span class='warning'>\The [src] already has a tank.</span>"
+			return
+		if(!user.unEquip(thetank))
+			return
+		user << "<span class='notice'>You hook \the [thetank] up to \the [src].</span>"
+		src.tank = thetank
+		thetank.loc = src
+	src.update_icons()
+
+/obj/item/weapon/pneumatic_cannon/proc/update_icons()
+	src.overlays.Cut()
+	if(!tank)
+		return
+	src.overlays += image('icons/obj/pneumaticCannon.dmi', "[tank.icon_state]")
+	src.update_icon()

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

@@ -340,3 +340,23 @@
 	..()
 	update_icon()
 
+
+
+///Aquatic Starter Kit
+
+/obj/item/weapon/storage/aquatic_kit
+	name = "aquatic starter kit"
+	desc = "It's a starter kit box for an acquarium."
+	icon_state = "AquaticKit"
+	throw_speed = 2
+	throw_range = 8
+
+/obj/item/weapon/storage/aquatic_kit/full
+	desc = "It's a starter kit for an acquarium; includes 1 tank brush, 1 egg scoop, 1 fish net, and 1 container of fish food."
+
+/obj/item/weapon/storage/aquatic_kit/full/New()
+	..()
+	new /obj/item/weapon/egg_scoop(src)
+	new /obj/item/weapon/fish_net(src)
+	new /obj/item/weapon/tank_brush(src)
+	new /obj/item/weapon/fishfood(src)

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

@@ -67,10 +67,9 @@
 
 	var/allgases = G.carbon_dioxide + G.nitrogen + G.oxygen + G.toxins	//fuck trace gases	-Pete
 	if(allgases >= 0.005)
-		return 1
+		. = 1
 
 	qdel(G)
-	return
 
 /obj/item/weapon/tank/jetpack/ui_action_click()
 	toggle()
@@ -136,3 +135,33 @@
 	if(air_contents.carbon_dioxide < 10)
 		user << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
 		playsound(user, 'sound/effects/alert.ogg', 50, 1)
+
+
+/obj/item/weapon/tank/jetpack/rig
+	name = "jetpack"
+	var/obj/item/weapon/rig/holder
+
+/obj/item/weapon/tank/jetpack/rig/examine()
+	usr << "It's a jetpack. If you can see this, report it on the bug tracker."
+	return 0
+
+/obj/item/weapon/tank/jetpack/rig/allow_thrust(num, mob/living/user as mob)
+
+	if(!(src.on))
+		return 0
+
+	if(!istype(holder) || !holder.air_supply)
+		return 0
+
+	var/obj/item/weapon/tank/pressure_vessel = holder.air_supply
+
+	if((num < 0.005 || pressure_vessel.air_contents.total_moles() < num))
+		src.ion_trail.stop()
+		return 0
+
+	var/datum/gas_mixture/G = pressure_vessel.air_contents.remove(num)
+
+	var/allgases = G.carbon_dioxide + G.nitrogen + G.oxygen + G.toxins
+	if(allgases >= 0.005)
+		. = 1
+	qdel(G)

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

@@ -120,8 +120,13 @@
 	data["maskConnected"] = 0
 	if(istype(loc,/mob/living/carbon))
 		var/mob/living/carbon/location = loc
-		if(location.internal == src || (location.wear_mask && (location.wear_mask.flags & MASKINTERNALS)))
-			data["maskConnected"] = 1
+		if(location.internal == src)
+			if(location.wear_mask && (location.wear_mask.flags & AIRTIGHT))
+				data["maskConnected"] = 1
+			else if(ishuman(location))
+				var/mob/living/carbon/human/H = location
+				if(H.head && (H.head.flags & AIRTIGHT))
+					data["maskConnected"] = 1
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -162,7 +167,16 @@
 				if (location.internals)
 					location.internals.icon_state = "internal0"
 			else
-				if(location.wear_mask && (location.wear_mask.flags & MASKINTERNALS))
+
+				var/can_open_valve
+				if(location.wear_mask && (location.wear_mask.flags & AIRTIGHT))
+					can_open_valve = 1
+				else if(istype(location,/mob/living/carbon/human))
+					var/mob/living/carbon/human/H = location
+					if(H.head && (H.head.flags & AIRTIGHT))
+						can_open_valve = 1
+
+				if(can_open_valve)
 					location.internal = src
 					usr << "\blue You open \the [src] valve."
 					if (location.internals)