SoundScopes' bugfixes - 01SEP2016 (#848)

code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm

@@ -1,12 +1,27 @@
 #ifndef T_BOARD
-#error T_BOARD macro is not defined but we need it! 
+#error T_BOARD macro is not defined but we need it!
 #endif
 
 /obj/item/weapon/circuitboard/unary_atmos
 	board_type = "machine"
+	var/machine_dir = SOUTH
+	var/init_dirs = SOUTH
+
+/obj/item/weapon/circuitboard/unary_atmos/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I,/obj/item/weapon/screwdriver))
+		machine_dir = turn(machine_dir, 90)
+		init_dirs = machine_dir
+		user.visible_message("\blue \The [user] adjusts the jumper on the [src]'s port configuration pins.", "\blue You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)].")
+	return
+
+/obj/item/weapon/circuitboard/unary_atmos/examine()
+	..()
+	usr << "The jumper is connecting the [dir2text(machine_dir)] pins."
 
 /obj/item/weapon/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U)
 	//TODO: Move this stuff into the relevant constructor when pipe/construction.dm is cleaned up.
+	U.dir = src.machine_dir
+	U.initialize_directions = src.init_dirs
 	U.initialize()
 	U.build_network()
 	if (U.node)

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

@@ -35,13 +35,22 @@
 			return ..()
 
 	if (reagents.total_volume > 0)
-		reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
 		if(M == user)
-			M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>")
+			if(M.get_species() == "Machine")
+				M.visible_message("<span class='notice'>\The [user] smudges some [loaded] from \the [src] on their screen.</span>","<span class='notice'>You smudge some [loaded] from \the [src] on your screen.</span>")
+			else
+				M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>","<span class='notice'>You eat some [loaded] from \the [src].</span>")
+				reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
+				playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
+				overlays.Cut()
 		else
-			M.visible_message("<span class='notice'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>")
-		playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
-		overlays.Cut()
+			if(M.get_species() == "Machine")
+				M.visible_message("<span class='notice'>\The [user] smudges some [loaded] onto [M].</span>","<span class='notice'>You smudge some [loaded] from \the [src] onto [M].</span>")
+			else
+				M.visible_message("<span class='notice'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>","<span class='notice'>You feed \the [M] some [loaded] with \the [src].</span>")
+				reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
+				playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
+				overlays.Cut()
 		return
 	else
 		user << "<span class='warning'>You don't have anything on \the [src].</span>"	//if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK GODDAMNIT
@@ -112,4 +121,4 @@
 		user.take_organ_damage(10)
 		user.Paralyse(2)
 		return
-	return ..()
+	return ..()

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

@@ -11,7 +11,7 @@
 	icon_state = "tray"
 	desc = "A metal tray to lay food on."
 	throwforce = 12.0
-	throwforce = 10.0
+	force = 10.0
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
@@ -315,4 +315,4 @@
 		if (!safedrop)
 			spill(user, src.loc)
 
-		safedrop = 0
+		safedrop = 0

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -18,6 +18,9 @@
 		user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
 							 "<span class='notice'>You pry open \the [src].</span>", \
 							 "<span class='notice'>You hear splitting wood.</span>")
+		for(var/obj/vehicle/V in T.contents)
+			if(V)
+				V.unload(user)
 		qdel(src)
 	else
 		return attack_hand(user)