Merge branch 'master' into nanoui-is-dead

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

@@ -33,7 +33,7 @@
 
 
 /obj/item/pipe_painter/attack_self(mob/user as mob)
-	mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes
+	mode = input("Which colour do you want to use?", name, mode) in modes
 
 /obj/item/pipe_painter/examine(mob/user)
 	. = ..()

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

@@ -0,0 +1,22 @@
+/obj/item/pipe_painter/window_painter
+	name = "window painter"
+	icon_state = "window_painter"
+
+	var/list/paintable_windows = list(
+			/obj/structure/window/reinforced,
+			/obj/structure/window/basic,
+			/obj/structure/window/full/reinforced,
+			/obj/structure/window/full/basic,
+			/obj/machinery/door/window)
+
+/obj/item/pipe_painter/window_painter/afterattack(atom/A, mob/user as mob)
+	if(!is_type_in_list(A, paintable_windows) || !in_range(user, A))
+		return
+	var/obj/structure/window/W = A
+
+	if(W.color == GLOB.pipe_colors[mode])
+		to_chat(user, "<span class='notice'>This window is aready painted [mode]!</span>")
+		return
+
+	playsound(loc, usesound, 30, TRUE)
+	W.color = GLOB.pipe_colors[mode]

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

@@ -5,20 +5,16 @@
 	w_class = WEIGHT_CLASS_BULKY
 	item_state = "jetpack"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
-	var/datum/effect_system/trail_follow/ion/ion_trail
 	actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
 	var/on = 0
 	var/stabilizers = 0
 	var/volume_rate = 500              //Needed for borg jetpack transfer
 
-/obj/item/tank/jetpack/New()
-	..()
-	ion_trail = new /datum/effect_system/trail_follow/ion()
-	ion_trail.set_up(src)
-
-/obj/item/tank/jetpack/Destroy()
-	QDEL_NULL(ion_trail)
-	return ..()
+/obj/item/tank/jetpack/on_mob_move(direction, mob/user)
+	if(on)
+		var/turf/T = get_step(src, GetOppositeDir(direction))
+		if(!has_gravity(T))
+			new /obj/effect/particle_effect/ion_trails(T, direction)
 
 /obj/item/tank/jetpack/ui_action_click(mob/user, actiontype)
 	if(actiontype == /datum/action/item_action/toggle_jetpack)
@@ -59,14 +55,11 @@
 /obj/item/tank/jetpack/proc/turn_on(mob/user)
 	on = TRUE
 	icon_state = "[initial(icon_state)]-on"
-	ion_trail.start()
 
 /obj/item/tank/jetpack/proc/turn_off(mob/user)
 	on = FALSE
 	stabilizers = FALSE
 	icon_state = initial(icon_state)
-	ion_trail.stop()
-
 
 /obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user)
 	if(!on)
@@ -150,8 +143,6 @@
 
 /obj/item/tank/jetpack/carbondioxide/New()
 	..()
-	ion_trail = new /datum/effect_system/trail_follow/ion()
-	ion_trail.set_up(src)
 	air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 
 /obj/item/tank/jetpack/carbondioxide/examine(mob/user)