Merge remote-tracking branch 'upstream/dev' into Brig2

code/game/objects/effects/chemsmoke.dm

@@ -224,24 +224,25 @@
 	pending += location
 
 	while(pending.len)
-		for(var/turf/simulated/current in pending)
+		for(var/turf/current in pending)
 			for(var/D in cardinal)
-				var/turf/simulated/target = get_step(current, D)
-
+				var/turf/target = get_step(current, D)
 				if(wallList)
 					if(istype(target, /turf/simulated/wall))
 						if(!(target in wallList))
 							wallList += target
 						continue
-				if(!target.zone)
-					continue
+				
 				if(target in pending)
 					continue
 				if(target in complete)
 					continue
 				if(!(target in targetTurfs))
 					continue
-
+				if(current.c_airblock(target)) //this is needed to stop chemsmoke from passing through thin window walls
+					continue
+				if(target.c_airblock(current)) 
+					continue
 				pending += target
 
 			pending -= current
@@ -249,4 +250,4 @@
 
 	targetTurfs = complete
 
-	return
+	return

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

@@ -0,0 +1,209 @@
+/obj/item/device/floor_painter
+	name = "floor painter"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "labeler1"
+	item_state = "flight"
+
+	var/mode_nice = "standard"
+	var/mode = "floor"
+	var/tile_dir_mode = 0
+
+	// mode 0  ignore direction; sets dir=0
+	// mode 1  all-direction
+	// mode 2  corner selecting the side CW from the selected corner
+	// mode 3  cardinal
+	// mode 4  warningcorner and warnwhitecorner direction fix
+	// mode 5  Opposite corner tiles where the second icon_state is "[mode]_inv"
+/obj/item/device/floor_painter/afterattack(atom/A, mob/user as mob, proximity)
+	if(!proximity)
+		return
+
+	if(istype(A, /turf/simulated/floor))
+		var/turf/simulated/floor/F = A
+
+		if(F.is_plasteel_floor()) // only tiled floors
+			if(tile_dir_mode)
+				var/D = get_dir(usr, F)
+				if(usr.loc == F)
+					D = usr.dir
+
+				switch(tile_dir_mode)
+					if(1) // All directions accepted
+						F.dir = D
+						F.icon_state = mode
+					if(2) // Corner mode - diagonal directions converted CW around.
+						switch(D)
+							if(NORTHEAST)
+								D = EAST
+							if(SOUTHEAST)
+								D = SOUTH
+							if(SOUTHWEST)
+								D = WEST
+							if(NORTHWEST)
+								D = NORTH
+						F.dir = D
+						F.icon_state = mode
+					if(3) // cardinal directions only. I've adjusted diagonals the same way the facing code does.
+						switch(D)
+							if(NORTHEAST)
+								D = EAST
+							if(SOUTHEAST)
+								D = EAST
+							if(SOUTHWEST)
+								D = WEST
+							if(NORTHWEST)
+								D = WEST
+						F.dir = D
+						F.icon_state = mode
+					if(4) // floors.dmi icon_states "warningcorner" and "warnwhitecorner" are incorrect, this fixes it
+						var/D2
+						switch(D)
+							if(NORTHEAST)
+								D2 = WEST
+							if(SOUTHEAST)
+								D2 = SOUTH
+							if(SOUTHWEST)
+								D2 = NORTH
+							if(NORTHWEST)
+								D2 = EAST
+						F.dir = D2
+						F.icon_state = mode
+					if(5)
+						F.dir = 0
+						if(D == NORTH || D == SOUTH || D == NORTHEAST || D == SOUTHWEST)
+							F.icon_state = mode
+						else
+							F.icon_state = "[mode]_inv"
+			else
+				F.dir = 0
+				F.icon_state = mode
+		else
+			usr << "You can't paint that!"
+
+/obj/item/device/floor_painter/attack_self(mob/user as mob)
+	var/type = input("What type of floor?", "Floor painter", "solid") in list("solid", "corner", "opposite corners", "side/three corners", "special", "letters")
+
+	tile_dir_mode = 0
+
+	switch(type)
+		if("solid")
+			tile_dir_mode = 0
+			var/design = input("Which color?", "Floor painter") in list("standard", "dark", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple", "freezer", "hydro", "showroom")
+			if(design == "standard")
+				mode = "floor"
+				mode_nice = "standard"
+				return
+			if(design == "white")
+				mode = "white"
+				mode_nice = "white"
+				return
+			if(design == "showroom" || design == "hydro" || design == "freezer")
+				mode = "[design]floor"
+				mode_nice = design
+				return
+			mode_nice = design
+			mode = "[replacetext(design, "-", "")]full"
+		if("corner")
+			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-grey", "white-red", "white-blue", "white-green", "white-yellow", "white-purple")
+			mode_nice = "[design] corner"
+			mode = "[replacetext(design, "-", "")]corner"
+			tile_dir_mode = 2
+		if("opposite corners")
+			var/design = input("Which design?", "Floor painter") in list("bar", "cmo", "yellowpatch", "cafeteria", "red-yellow", "red-blue", "red-green", "green-yellow", "green-blue", "blue-yellow")
+			mode_nice = design
+			if(design == "bar" || design == "cmo" || design == "yellowpatch" || design == "cafeteria")
+				mode = design
+			else
+				mode = "[replacetext(design, "-", "")]full"
+			if(design == "yellowpatch")
+				tile_dir_mode = 5
+			else
+				tile_dir_mode = 0
+		if("side/three corners")
+			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple", "red-yellow", "red-blue", "blue-red", "red-green", "green-yellow", "green-blue", "blue-yellow")
+			if(design == "white")
+				mode = "whitehall"
+				mode_nice = "white side"
+				tile_dir_mode = 1
+			else
+				mode_nice = design
+				mode = replacetext(design, "-", "")
+				tile_dir_mode = 1
+		if("special")
+			var/design = input("Which design?", "Floor painter") in list("arrival", "escape", "caution", "warning", "white-warning", "white-blue-green", "loadingarea", "delivery", "bot", "white-delivery", "white-bot")
+			if(design == "white-blue-green")
+				mode_nice = design
+				mode = "whitebluegreencorners"
+				tile_dir_mode = 2
+			else if(design == "delivery" || design == "bot")
+				mode_nice = design
+				mode = design
+				tile_dir_mode = 0
+			else if(design == "loadingarea")
+				mode_nice = design
+				mode = design
+				tile_dir_mode = 3
+			else
+				if(design == "white-warning")
+					mode_nice = design
+					design = "warnwhite"
+				var/s_corner = alert("Do you want to paint a single corner of the tile?", "Floor painter","Yes","No") == "Yes"
+				if(s_corner)
+					mode_nice = "[design] corner"
+					mode = "[design]corner"
+					if(design == "warning" || design == "white-warning") // sprites for these are weird, need to fix dirs (icons/turf/floors.dmi, "warningcorner" and "warnwhitecorner")
+						tile_dir_mode = 4
+					else
+						tile_dir_mode = 2
+				else
+					mode_nice = design
+					mode = design
+					tile_dir_mode = 1
+		if("letters")
+			var/which = input("Which letters/design?", "Floor painter") in list("A1", "A2", "DI", "SA", "SA (red)", "SB", "SB (red)", "SC", "SC (red)", "W (red)", "V (green)", "Psy", "Ex", "Ex (blue)", "CMO", "O (OP)", "P (OP)")
+			mode_nice = which
+			switch(which)
+				if("A1")
+					mode = "white_1"
+				if("A2")
+					mode = "white_2"
+				if("DI")
+					mode = "white_d"
+				if("SA")
+					mode = "white_a"
+				if("SA (red)")
+					mode = "whitered_a"
+					tile_dir_mode = 3
+				if("SB")
+					mode = "white_b"
+				if("SB (red)")
+					mode = "whitered_b"
+					tile_dir_mode = 3
+				if("SC")
+					mode = "white_c"
+				if("SC (red)")
+					mode = "whitered_c"
+					tile_dir_mode = 3
+				if("W (red)")
+					mode = "whitered_w"
+					tile_dir_mode = 3
+				if("V (green)")
+					mode = "whitegreen_v"
+					tile_dir_mode = 3
+				if("Psy")
+					mode = "white_p"
+				if("Ex")
+					mode = "white_ex"
+				if("Ex (blue)")
+					mode = "whiteblue_ex"
+					tile_dir_mode = 3
+				if("CMO") // yes this is also in "opposite corners" choices, but it's a different icon_state  (!!)
+					mode = "white_cmo"
+				if("O (OP)")
+					mode = "white_halfo"
+				if("P (OP)")
+					mode = "white_halfp"
+
+/obj/item/device/floor_painter/examine()
+	..()
+	usr << "It is in [mode_nice] mode."

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

@@ -65,24 +65,4 @@
 	else
 		user << "<span class='notice'>Where are the lips on that?</span>"
 
-//you can wipe off lipstick with paper!
-/obj/item/weapon/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(user.zone_sel.selecting == "mouth")
-		if(!istype(M, /mob))	return
-
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(H == user)
-				user << "<span class='notice'>You wipe off the lipstick with [src].</span>"
-				H.lip_style = null
-				H.update_body()
-			else
-				user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
-								 	 "<span class='notice'>You begin to wipe off [H]'s lipstick.</span>")
-				if(do_after(user, 10) && do_after(H, 10, 5, 0))	//user needs to keep their active hand, H does not.
-					user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
-										 "<span class='notice'>You wipe off [H]'s lipstick.</span>")
-					H.lip_style = null
-					H.update_body()
-	else
-		..()
+//you can wipe off lipstick with paper! see code/modules/paperwork/paper.dm, paper/attack()

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

@@ -397,7 +397,7 @@
 
 /obj/item/weapon/storage/box/mousetraps
 	name = "box of Pest-B-Gon mousetraps"
-	desc = "<B><FONT=red>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
+	desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
 	icon_state = "mousetraps"
 
 	New()
@@ -506,4 +506,4 @@
 	for(var/i = 0; i < 14; i++)
 		new /obj/item/weapon/light/tube(src)
 	for(var/i = 0; i < 7; i++)
-		new /obj/item/weapon/light/bulb(src)
+		new /obj/item/weapon/light/bulb(src)

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

@@ -202,6 +202,55 @@
 	icon_state = "Dpacket"
 	item_state = "Dpacket"
 
+/obj/item/weapon/storage/fancy/cigar
+	name = "cigar case"
+	desc = "A case for holding your cigars when you are not smoking them."
+	icon_state = "cigarcase"
+	item_state = "cigarcase"
+	icon = 'icons/obj/cigarettes.dmi'
+	w_class = 1
+	throwforce = 2
+	flags = TABLEPASS
+	slot_flags = SLOT_BELT
+	storage_slots = 7
+	can_hold = list("/obj/item/clothing/mask/cigarette/cigar")
+	icon_type = "cigar"
+
+/obj/item/weapon/storage/fancy/cigar/New()
+	..()
+	flags |= NOREACT
+	for(var/i = 1 to storage_slots)
+		new /obj/item/clothing/mask/cigarette/cigar(src)
+	create_reagents(15 * storage_slots)
+
+/obj/item/weapon/storage/fancy/cigar/Del()
+	del(reagents)
+	..()
+
+/obj/item/weapon/storage/fancy/cigar/update_icon()
+	icon_state = "[initial(icon_state)][contents.len]"
+	return
+
+/obj/item/weapon/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location)
+		var/obj/item/clothing/mask/cigarette/cigar/C = W
+		if(!istype(C)) return
+		reagents.trans_to(C, (reagents.total_volume/contents.len))
+		..()
+
+/obj/item/weapon/storage/fancy/cigar/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M, /mob))
+		return
+
+	if(M == user && user.zone_sel.selecting == "mouth" && contents.len > 0 && !user.wear_mask)
+		var/obj/item/clothing/mask/cigarette/cigar/W = new /obj/item/clothing/mask/cigarette/cigar(user)
+		reagents.trans_to(W, (reagents.total_volume/contents.len))
+		user.equip_to_slot_if_possible(W, slot_wear_mask)
+		reagents.maximum_volume = 15 * contents.len
+		contents.len--
+		user << "<span class='notice'>You take a cigar out of the case.</span>"
+		update_icon()
+	else
+		..()
 
 /*
  * Vial Box

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

@@ -13,62 +13,58 @@
 	var/volume_rate = 500              //Needed for borg jetpack transfer
 	icon_action_button = "action_jetpack"
 
-	New()
-		..()
-		src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
-		src.ion_trail.set_up(src)
-		return
+/obj/item/weapon/tank/jetpack/New()
+	..()
+	src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
+	src.ion_trail.set_up(src)
 
+/obj/item/weapon/tank/jetpack/examine()
+	set src in usr
+	..()
+	if(air_contents.gas["oxygen"] < 10)
+		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
+		playsound(usr, 'sound/effects/alert.ogg', 50, 1)
 
-	examine()
-		set src in usr
-		..()
-		if(air_contents.gas["oxygen"] < 10)
-			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-			playsound(usr, 'sound/effects/alert.ogg', 50, 1)
-		return
+/obj/item/weapon/tank/jetpack/verb/toggle_rockets()
+	set name = "Toggle Jetpack Stabilization"
+	set category = "Object"
+	src.stabilization_on = !( src.stabilization_on )
+	usr << "You toggle the stabilization [stabilization_on? "on":"off"]."
 
+/obj/item/weapon/tank/jetpack/verb/toggle()
+	set name = "Toggle Jetpack"
+	set category = "Object"
 
-	verb/toggle_rockets()
-		set name = "Toggle Jetpack Stabilization"
-		set category = "Object"
-		src.stabilization_on = !( src.stabilization_on )
-		usr << "You toggle the stabilization [stabilization_on? "on":"off"]."
-		return
+	on = !on
+	if(on)
+		icon_state = "[icon_state]-on"
+		ion_trail.start()
+	else
+		icon_state = initial(icon_state)
+		ion_trail.stop()
 
+	if (ismob(usr))
+		var/mob/M = usr
+		M.update_inv_back()
 
-	verb/toggle()
-		set name = "Toggle Jetpack"
-		set category = "Object"
-		on = !on
-		if(on)
-			icon_state = "[icon_state]-on"
-//			item_state = "[item_state]-on"
-			ion_trail.start()
-		else
-			icon_state = initial(icon_state)
-//			item_state = initial(item_state)
-			ion_trail.stop()
-		return
+/obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob)
+	if(!(src.on))
+		return 0
+	if((num < 0.005 || src.air_contents.total_moles < num))
+		src.ion_trail.stop()
+		return 0
 
+	var/datum/gas_mixture/G = src.air_contents.remove(num)
 
-	proc/allow_thrust(num, mob/living/user as mob)
-		if(!(src.on))
-			return 0
-		if((num < 0.005 || src.air_contents.total_moles < num))
-			src.ion_trail.stop()
-			return 0
+	var/allgases = G.gas["carbon_dioxide"] + G.gas["nitrogen"] + G.gas["oxygen"] + G.gas["phoron"]
+	if(allgases >= 0.005)
+		return 1
 
-		var/datum/gas_mixture/G = src.air_contents.remove(num)
+	del(G)
+	return
 
-		if(G.total_moles >= 0.005)
-			return 1
-
-		del(G)
-		return
-
-	ui_action_click()
-		toggle()
+/obj/item/weapon/tank/jetpack/ui_action_click()
+	toggle()
 
 
 /obj/item/weapon/tank/jetpack/void
@@ -77,10 +73,10 @@
 	icon_state = "jetpack-void"
 	item_state =  "jetpack-void"
 
-	New()
-		..()
-		air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-		return
+/obj/item/weapon/tank/jetpack/void/New()
+	..()
+	air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
 /obj/item/weapon/tank/jetpack/oxygen
 	name = "Jetpack (Oxygen)"
@@ -88,10 +84,10 @@
 	icon_state = "jetpack"
 	item_state = "jetpack"
 
-	New()
-		..()
-		air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-		return
+/obj/item/weapon/tank/jetpack/oxygen/New()
+	..()
+	air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
 /obj/item/weapon/tank/jetpack/carbondioxide
 	name = "Jetpack (Carbon Dioxide)"
@@ -100,18 +96,18 @@
 	icon_state = "jetpack-black"
 	item_state =  "jetpack-black"
 
-	New()
-		..()
-		src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
-		src.ion_trail.set_up(src)
-		//src.air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-		air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-		return
+/obj/item/weapon/tank/jetpack/carbondioxide/New()
+	..()
+	src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
+	src.ion_trail.set_up(src)
+	//src.air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
-	examine()
-		set src in usr
-		..()
-		if(air_contents.gas["carbon_dioxide"] < 10)
-			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-			playsound(usr, 'sound/effects/alert.ogg', 50, 1)
-		return
+/obj/item/weapon/tank/jetpack/carbondioxide/examine()
+	set src in usr
+	..()
+	if(air_contents.gas["carbon_dioxide"] < 10)
+		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
+		playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+	return

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

@@ -251,9 +251,9 @@
 		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return
 	else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding)
-		message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
-		log_game("[key_name(user)] triggered a fueltank explosion.")
-		user << "\red That was stupid of you."
+		message_admins("[key_name_admin(user)] triggered a fueltank explosion with a welding tool.")
+		log_game("[key_name(user)] triggered a fueltank explosion with a welding tool.")
+		user << "\red You begin welding on the fueltank and with a moment of lucidity you realize, this might not have been the smartest thing you've ever done."
 		var/obj/structure/reagent_dispensers/fueltank/tank = O
 		tank.explode()
 		return
@@ -470,4 +470,4 @@
 			user << "Nothing to fix!"
 
 	else
-		return ..()
+		return ..()

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

@@ -25,10 +25,10 @@
 			if(istype(O, /obj/item/device/multitool))
 				user << "\red Resetting circuitry..."
 				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
-				sleep(50) // Sleeping time~
-				src.locked = 0
-				user << "\blue You disable the locking modules."
-				update_icon()
+				if(do_after(user, 20))
+					src.locked = 0
+					user << "<span class = 'caution'> You disable the locking modules.</span>"
+					update_icon()
 				return
 			else if(istype(O, /obj/item/weapon))
 				var/obj/item/weapon/W = O
@@ -87,6 +87,9 @@
 					src.locked = 1
 					user << "\blue You re-enable the locking modules."
 					playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+					if(do_after(user,20))
+						src.locked = 1
+						user << "<span class = 'caution'> You re-enable the locking modules.</span>"
 					return
 			else
 				localopened = !localopened

code/game/objects/structures/window.dm

@@ -163,6 +163,7 @@
 
 /obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
 	if(!istype(W)) return//I really wish I did not need this
+	if(W.flags & NOBLUDGEON) return
 
 	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W