Merge master into map-development

code/game/objects/structures/grille.dm

@@ -96,7 +96,7 @@
 	if(iswirecutter(W))
 		if(!shock(user, 100))
 			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
-			getFromPool(/obj/item/stack/rods, list(get_turf(src), destroyed ? 1 : 2))
+			getFromPool(/obj/item/stack/rods, get_turf(src), destroyed ? 1 : 2)
 			qdel(src)
 	else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
 		if(!shock(user, 90))

code/game/objects/structures/janicart.dm

@@ -22,8 +22,21 @@
 	var/has_items = 0//This is set true whenever the cart has anything loaded/mounted on it
 	var/dismantled = 0//This is set true after the object has been dismantled to avoid an infintie loop
 
-///obj/structure/janitorialcart/New()
+/obj/structure/janitorialcart/New()
+	..()
+	janitorial_supplies |= src
 
+/obj/structure/janitorialcart/Destroy()
+	janitorial_supplies -= src
+	QDEL_NULL(mybag)
+	QDEL_NULL(mymop)
+	QDEL_NULL(myspray)
+	QDEL_NULL(myreplacer)
+	QDEL_NULL(mybucket)
+	return ..()
+
+/obj/structure/janitorialcart/proc/get_short_status()
+	return "Contents: [english_list(contents)]"
 
 /obj/structure/janitorialcart/examine(mob/user)
 	if(..(user, 1))

code/game/objects/structures/mop_bucket.dm

@@ -10,12 +10,17 @@
 
 
 /obj/structure/mopbucket/New()
-	create_reagents(100)
 	..()
+	create_reagents(100)
+	janitorial_supplies |= src
+
+/obj/structure/mobbucket/Destroy()
+	janitorial_supplies -= src
+	return ..()
 
 /obj/structure/mopbucket/examine(mob/user)
 	if(..(user, 1))
-		user << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
+		user << "Contains [reagents.total_volume] unit\s of water."
 
 /obj/structure/mopbucket/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/weapon/mop))

code/game/objects/structures/watercloset.dm

@@ -18,6 +18,7 @@
 
 /obj/structure/toilet/attack_hand(mob/living/user as mob)
 	if(swirlie)
+		usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		usr.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie.name]'s head!</span>", "<span class='notice'>You slam the toilet seat onto [swirlie.name]'s head!</span>", "You hear reverberating porcelain.")
 		swirlie.adjustBruteLoss(8)
 		return
@@ -53,6 +54,7 @@
 			return
 
 	if(istype(I, /obj/item/weapon/grab))
+		usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		var/obj/item/weapon/grab/G = I
 
 		if(isliving(G.affecting))
@@ -117,7 +119,7 @@
 
 /obj/machinery/shower
 	name = "shower"
-	desc = "The HS-451. Installed in the 2550s by the Hygiene Division."
+	desc = "The HS-451. Installed in the 2450s by the Hygiene Division."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "shower"
 	density = 0
@@ -453,9 +455,7 @@
 					R.cell.charge -= 20
 				else
 					B.deductcharge(B.hitcost)
-				user.visible_message( \
-					"<span class='danger'>[user] was stunned by \his wet [O]!</span>", \
-					"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
+				user.visible_message("<span class='danger'>[user] was stunned by \the [O]!</span>")
 				return 1
 	// Short of a rewrite, this is necessary to stop monkeycubes being washed.
 	else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))

code/game/objects/structures/windoor_assembly.dm

@@ -17,6 +17,7 @@ obj/structure/windoor_assembly
 	density = 0
 	dir = NORTH
 	w_class = 3
+	flags = ON_BORDER
 
 	var/obj/item/weapon/airlock_electronics/electronics = null
 
@@ -79,7 +80,7 @@ obj/structure/windoor_assembly/Destroy()
 						user << "<span class='notice'>You dissasembled the windoor assembly!</span>"
 						new /obj/item/stack/material/glass/reinforced(get_turf(src), 5)
 						if(secure)
-							getFromPool(/obj/item/stack/rods, list(get_turf(src), 4))
+							getFromPool(/obj/item/stack/rods, get_turf(src), 4)
 						qdel(src)
 				else
 					user << "<span class='notice'>You need more welding fuel to dissassemble the windoor assembly.</span>"
@@ -261,18 +262,60 @@ obj/structure/windoor_assembly/Destroy()
 
 
 //Rotates the windoor assembly clockwise
-/obj/structure/windoor_assembly/verb/revrotate()
-	set name = "Rotate Windoor Assembly"
+//These directions are fucked up, apparently dm rotates anticlockwise by default
+/obj/structure/windoor_assembly/verb/rotate()
+	set name = "Rotate Windoor Clockwise"
 	set category = "Object"
 	set src in oview(1)
 
+	var/targetdir = turn(src.dir, 270)
+
+	for(var/obj/obstacle in get_turf(src))
+		if (obstacle == src)
+			continue
+
+		if((obstacle.flags & ON_BORDER) && obstacle.dir == targetdir)
+			usr << span("danger", "You can't turn the windoor assembly that way, there's already something there!")
+			return
+
 	if (src.anchored)
 		usr << "It is fastened to the floor; therefore, you can't rotate it!"
 		return 0
 	if(src.state != "01")
 		update_nearby_tiles(need_rebuild=1) //Compel updates before
 
-	src.set_dir(turn(src.dir, 270))
+	src.set_dir(targetdir)
+
+	if(src.state != "01")
+		update_nearby_tiles(need_rebuild=1)
+
+	update_icon()
+	return
+
+
+//Rotates the windoor assembly anticlockwise
+/obj/structure/windoor_assembly/verb/revrotate()
+	set name = "Rotate Windoor Anticlockwise"
+	set category = "Object"
+	set src in oview(1)
+
+	var/targetdir = turn(src.dir, 90)
+
+	for(var/obj/obstacle in get_turf(src))
+		if (obstacle == src)
+			continue
+
+		if((obstacle.flags & ON_BORDER) && obstacle.dir == targetdir)
+			usr << span("danger", "You can't turn the windoor assembly that way, there's already something there!")
+			return
+
+	if (src.anchored)
+		usr << "It is fastened to the floor; therefore, you can't rotate it!"
+		return 0
+	if(src.state != "01")
+		update_nearby_tiles(need_rebuild=1) //Compel updates before
+
+	src.set_dir(targetdir)
 
 	if(src.state != "01")
 		update_nearby_tiles(need_rebuild=1)

code/game/objects/structures/window_spawner.dm

@@ -35,7 +35,7 @@
 /obj/effect/wingrille_spawn/proc/activate()
 	if(activated) return
 	if (!locate(/obj/structure/grille) in get_turf(src))
-		var/obj/structure/grille/G = getFromPool(/obj/structure/grille, src.loc)
+		var/obj/structure/grille/G = new /obj/structure/grille(src.loc)
 		handle_grille_spawn(G)
 	var/list/neighbours = list()
 	for (var/dir in cardinal)
@@ -49,7 +49,7 @@
 						found_connection = 1
 						qdel(W)
 			if(!found_connection)
-				var/obj/structure/window/new_win = getFromPool(win_path, src.loc)
+				var/obj/structure/window/new_win = new win_path(src.loc)
 				new_win.set_dir(dir)
 				handle_window_spawn(new_win)
 		else