Merge remote-tracking branch 'upstream/master' into attack-hulk

# Conflicts:
#	code/game/objects/structures/window.dm

code/game/objects/effects/decals/misc.dm

@@ -1,12 +1,3 @@
-/obj/effect/decal/point
-	name = "arrow"
-	desc = "It's an arrow hanging in mid-air. There may be a wizard about."
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "arrow"
-	layer = 16.0
-	anchored = 1
-	mouse_opacity = 0
-
 // Used for spray that you spray at walls, tables, hydrovats etc
 /obj/effect/decal/spraystill
 	density = 0

code/game/objects/effects/spiders.dm

@@ -219,7 +219,7 @@
 						if(C)
 							S.key = C.key
 							if(S.master_commander)
-								to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist them in completing their goals at any cost.</span>")
+								to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist [S.master_commander.p_them()] in completing [S.master_commander.p_their()] goals at any cost.</span>")
 			qdel(src)
 
 /obj/effect/decal/cleanable/spiderling_remains

code/game/objects/effects/temporary_visuals/clockcult.dm

@@ -6,6 +6,10 @@
 	randomdir = 0
 	layer = ABOVE_NORMAL_TURF_LAYER
 
+/obj/effect/temp_visual/ratvar/door/window
+	icon_state = "ratvarwindoorglow"
+	layer = ABOVE_WINDOW_LAYER
+
 /obj/effect/temp_visual/ratvar/beam
 	icon_state = "ratvarbeamglow"
 
@@ -15,6 +19,13 @@
 /obj/effect/temp_visual/ratvar/floor
 	icon_state = "ratvarfloorglow"
 
+/obj/effect/temp_visual/ratvar/window
+	icon_state = "ratvarwindowglow"
+	layer = ABOVE_OBJ_LAYER
+
+/obj/effect/temp_visual/ratvar/window/single
+	icon_state = "ratvarwindowglow_s"
+
 /obj/effect/temp_visual/ratvar/grille
 	icon_state = "ratvargrilleglow"
 	layer = BELOW_OBJ_LAYER

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -1,3 +1,12 @@
+/obj/effect/temp_visual/point
+	name = "arrow"
+	desc = "It's an arrow hanging in mid-air. There may be a wizard about."
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "arrow"
+	layer = POINT_LAYER
+	duration = 20
+	randomdir = FALSE
+
 /obj/effect/temp_visual/dir_setting/bloodsplatter
 	icon = 'icons/effects/blood.dmi'
 	duration = 5