Merge remote-tracking branch 'upstream/master' into logging-improvements

code/game/gamemodes/events/ninja_abilities.dm

@@ -145,12 +145,12 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 //=======//EM PULSE//=======//
 //Disables nearby tech equipment.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
-	set name = "EM Burst (1,500E)"
+	set name = "EM Burst (2,000E)"
 	set desc = "Disable any nearby technology with a electro-magnetic pulse."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
-	var/C = 1500
+	var/C = 2000
 	if(!ninjacost(C, 1))
 		var/mob/living/carbon/human/U = affecting
 		playsound(U.loc, 'sound/effects/EMPulse.ogg', 60, 2)

code/game/objects/structures/fullwindow.dm

@@ -105,4 +105,9 @@
 		color = null
 
 	update_icon() //icon_state has to be set manually
-		return
+		return
+
+/obj/structure/window/full/shuttle/dark
+	icon = 'icons/turf/shuttle.dmi'
+	icon_state = "window5"
+	basestate = "window5"