Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

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

@@ -210,6 +210,7 @@
 		if(istype(W, /obj/item/weapon/grab))
 			var/obj/item/weapon/grab/G = W
 			src.MouseDrop_T(G.affecting, user)      //act like they were dragged onto the closet
+			return 0
 		if(istype(W,/obj/item/tk_grab))
 			return 0
 		if(istype(W, /obj/item/weapon/weldingtool))
@@ -257,11 +258,9 @@
 		return
 	if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis)
 		return
-	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
+	if((!( istype(O, /atom/movable) ) || O.anchored || !Adjacent(user) || !Adjacent(O) || !user.Adjacent(O) || user.contents.Find(src)))
 		return
-	if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems
-		return
-	if(!istype(user.loc, /turf)) // are you in a container/closet/pod/etc?
+	if(!isturf(user.loc)) // are you in a container/closet/pod/etc?
 		return
 	if(!src.opened)
 		return

code/game/objects/structures/girders.dm

@@ -7,6 +7,7 @@
 	var/health = 200
 	var/cover = 50 //how much cover the girder provides against projectiles.
 	var/material/reinf_material
+	var/reinforcing = 0
 
 /obj/structure/girder/displaced
 	icon_state = "displaced"
@@ -48,6 +49,7 @@
 	health = min(health,initial(health))
 	state = 0
 	icon_state = initial(icon_state)
+	reinforcing = 0
 	if(reinf_material)
 		reinforce_girder()
 
@@ -78,13 +80,18 @@
 		user << "<span class='notice'>You drill through the girder!</span>"
 		dismantle()
 
-	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2)
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
-		user << "<span class='notice'>Now unsecuring support struts...</span>"
-		if(do_after(user,40))
-			if(!src) return
-			user << "<span class='notice'>You unsecured the support struts!</span>"
-			state = 1
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(state == 2)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			user << "<span class='notice'>Now unsecuring support struts...</span>"
+			if(do_after(user,40))
+				if(!src) return
+				user << "<span class='notice'>You unsecured the support struts!</span>"
+				state = 1
+		else if(anchored && !reinf_material)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			reinforcing = !reinforcing
+			user << "<span class='notice'>\The [src] can now be [reinforcing? "reinforced" : "constructed"]!</span>"
 
 	else if(istype(W, /obj/item/weapon/wirecutters) && state == 1)
 		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
@@ -108,95 +115,82 @@
 			cover = 25
 
 	else if(istype(W, /obj/item/stack/material))
-
-		var/obj/item/stack/S = W
-		if(S.get_amount() < 2)
-			return ..()
-
-		var/material/M = S.get_material()
-		if(!istype(M))
-			return ..()
-
-		var/wall_fake
-		add_hiddenprint(usr)
-
-		if(M.integrity < 50)
-			user << "<span class='notice'>This material is too soft for use in wall construction.</span>"
-			return
-
-		user << "<span class='notice'>You begin adding the plating...</span>"
-
-		if(!do_after(user,40) || !S.use(2))
-			return
-
-		if(anchored)
-			user << "<span class='notice'>You added the plating!</span>"
+		if(reinforcing && !reinf_material)
+			if(!reinforce_with_material(W, user))
+				return ..()
 		else
-			user << "<span class='notice'>You create a false wall! Push on it to open or close the passage.</span>"
-			wall_fake = 1
+			if(!construct_wall(W, user))
+				return ..()
 
-		var/turf/Tsrc = get_turf(src)
-		Tsrc.ChangeTurf(/turf/simulated/wall)
-		var/turf/simulated/wall/T = get_turf(src)
-		T.set_material(M, reinf_material)
-		if(wall_fake)
-			T.can_open = 1
-		T.add_hiddenprint(usr)
-		qdel(src)
-		return
-
-	else if(istype(W, /obj/item/pipe))
-		var/obj/item/pipe/P = W
-		if (P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
-			user.drop_item()
-			P.loc = src.loc
-			user << "<span class='notice'>You fit the pipe into the [src]!</span>"
 	else
-		..()
+		return ..()
+
+/obj/structure/girder/proc/construct_wall(obj/item/stack/material/S, mob/user)
+	if(S.get_amount() < 2)
+		user << "<span class='notice'>There isn't enough material here to construct a wall.</span>"
+		return 0
+
+	var/material/M = name_to_material[S.default_type]
+	if(!istype(M))
+		return 0
+
+	var/wall_fake
+	add_hiddenprint(usr)
+
+	if(M.integrity < 50)
+		user << "<span class='notice'>This material is too soft for use in wall construction.</span>"
+		return 0
+
+	user << "<span class='notice'>You begin adding the plating...</span>"
+
+	if(!do_after(user,40) || !S.use(2))
+		return 1 //once we've gotten this far don't call parent attackby()
+
+	if(anchored)
+		user << "<span class='notice'>You added the plating!</span>"
+	else
+		user << "<span class='notice'>You create a false wall! Push on it to open or close the passage.</span>"
+		wall_fake = 1
+
+	var/turf/Tsrc = get_turf(src)
+	Tsrc.ChangeTurf(/turf/simulated/wall)
+	var/turf/simulated/wall/T = get_turf(src)
+	T.set_material(M, reinf_material)
+	if(wall_fake)
+		T.can_open = 1
+	T.add_hiddenprint(usr)
+	qdel(src)
+	return 1
+
+/obj/structure/girder/proc/reinforce_with_material(obj/item/stack/material/S, mob/user) //if the verb is removed this can be renamed.
+	if(reinf_material)
+		user << "<span class='notice'>\The [src] is already reinforced.</span>"
+		return 0
+
+	if(S.get_amount() < 2)
+		user << "<span class='notice'>There isn't enough material here to reinforce the girder.</span>"
+		return 0
+
+	var/material/M = name_to_material[S.default_type]
+	if(!istype(M) || M.integrity < 50)
+		user << "You cannot reinforce \the [src] with that; it is too soft."
+		return 0
+
+	user << "<span class='notice'>Now reinforcing...</span>"
+	if (!do_after(user,40) || !S.use(2))
+		return 1 //don't call parent attackby() past this point
+	user << "<span class='notice'>You added reinforcement!</span>"
+
+	reinf_material = M
+	reinforce_girder()
+	return 1
 
 /obj/structure/girder/proc/reinforce_girder()
 	cover = reinf_material.hardness
 	health = 500
 	state = 2
 	icon_state = "reinforced"
-
-/obj/structure/girder/verb/reinforce_with_material()
-	set name = "Reinforce girder"
-	set desc = "Reinforce a girder with metal."
-	set src in view(1)
-
-	var/mob/living/user = usr
-	if(!istype(user) || !(user.l_hand || user.r_hand))
-		return
-
-	if(reinf_material)
-		user << "\The [src] is already reinforced."
-		return
-
-	var/obj/item/stack/material/S = user.l_hand
-	if(!istype(S))
-		S = user.r_hand
-	if(!istype(S))
-		user << "You cannot plate \the [src] with that."
-		return
-
-	if(S.get_amount() < 2)
-		user << "There is not enough material here to reinforce the girder."
-		return
-
-	var/material/M = S.get_material()
-	if(!istype(M) || M.integrity < 50)
-		user << "You cannot reinforce \the [src] with that; it is too soft."
-		return
-
-	user << "<span class='notice'>Now reinforcing...</span>"
-	if (!do_after(user,40) || !S.use(2))
-		return
-	user << "<span class='notice'>You added reinforcement!</span>"
-
-	reinf_material = M
-	reinforce_girder()
-
+	reinforcing = 0
 
 /obj/structure/girder/proc/dismantle()
 	new /obj/item/stack/material/steel(get_turf(src))

code/game/objects/structures/watercloset.dm

@@ -129,6 +129,7 @@
 	var/watertemp = "normal"	//freezing, normal, or boiling
 	var/mobpresent = 0		//true if there is a mob on the shower's loc, this is to ease process()
 	var/is_washing = 0
+	var/list/temperature_settings = list("normal" = 310, "boiling" = T0C+100, "freezing" = T0C)
 
 /obj/machinery/shower/New()
 	..()
@@ -150,7 +151,7 @@
 	if(on)
 		if (M.loc == loc)
 			wash(M)
-			check_heat(M)
+			process_heat(M)
 		for (var/atom/movable/G in src.loc)
 			G.clean_blood()
 
@@ -158,15 +159,11 @@
 	if(I.type == /obj/item/device/analyzer)
 		user << "<span class='notice'>The water temperature seems to be [watertemp].</span>"
 	if(istype(I, /obj/item/weapon/wrench))
+		var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings
 		user << "<span class='notice'>You begin to adjust the temperature valve with \the [I].</span>"
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		if(do_after(user, 50))
-			switch(watertemp)
-				if("normal")
-					watertemp = "freezing"
-				if("freezing")
-					watertemp = "boiling"
-				if("boiling")
-					watertemp = "normal"
+			watertemp = newtemp
 			user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I].</span>")
 			add_fingerprint(user)
 
@@ -177,8 +174,8 @@
 
 	if(on)
 		overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
-		if(watertemp == "freezing")
-			return
+		if(temperature_settings[watertemp] < T20C)
+			return //no mist for cold water
 		if(!ismist)
 			spawn(50)
 				if(src && on)
@@ -200,7 +197,7 @@
 	wash(O)
 	if(ismob(O))
 		mobpresent += 1
-		check_heat(O)
+		process_heat(O)
 
 /obj/machinery/shower/Uncrossed(atom/movable/O)
 	if(ismob(O))
@@ -304,8 +301,8 @@
 	if(!on) return
 	wash_floor()
 	if(!mobpresent)	return
-	for(var/mob/living/carbon/C in loc)
-		check_heat(C)
+	for(var/mob/living/L in loc)
+		process_heat(L)
 
 /obj/machinery/shower/proc/wash_floor()
 	if(!ismist && is_washing)
@@ -317,22 +314,19 @@
 	spawn(100)
 		is_washing = 0
 
-/obj/machinery/shower/proc/check_heat(mob/M as mob)
-	if(!on || watertemp == "normal") return
-	if(iscarbon(M))
-		var/mob/living/carbon/C = M
-
-		if(watertemp == "freezing")
-			C.bodytemperature = max(80, C.bodytemperature - 80)
-			C << "<span class='warning'>The water is freezing!</span>"
-			return
-		if(watertemp == "boiling")
-			C.bodytemperature = min(500, C.bodytemperature + 35)
-			C.adjustFireLoss(5)
-			C << "<span class='danger'>The water is searing!</span>"
-			return
-
-
+/obj/machinery/shower/proc/process_heat(mob/living/M)
+	if(!on || !istype(M)) return
+	
+	var/temperature = temperature_settings[watertemp]
+	var/temp_adj = between(BODYTEMP_COOLING_MAX, temperature - M.bodytemperature, BODYTEMP_HEATING_MAX)
+	M.bodytemperature += temp_adj
+	
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(temperature >= H.species.heat_level_1)
+			H << "<span class='danger'>The water is searing hot!</span>"
+		else if(temperature <= H.species.cold_level_1)
+			H << "<span class='warning'>The water is freezing cold!</span>"
 
 /obj/item/weapon/bikehorn/rubberducky
 	name = "rubber ducky"