Merge pull request #180 from Markolie/master

Shuttle fixes

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

@@ -330,7 +330,7 @@
 							user.visible_message("<span class='boldnotice'>[defib] pings: Resuscitation successful.</span>")
 							playsound(get_turf(src), 'sound/machines/ping.ogg', 50, 0)
 							H.stat = 1
-							H.revive()
+							H.update_revive()
 							H.emote("gasp")
 							if(tplus > tloss)
 								H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))

code/game/objects/structures/window.dm

@@ -381,7 +381,8 @@ var/global/wcColored
 /obj/structure/window/New(Loc,re=0)
 	..()
 	ini_dir = dir
-	color = color_windows(src)
+	if(!color)
+		color = color_windows(src)
 	update_nearby_tiles(need_rebuild=1)
 	update_nearby_icons()
 	return
@@ -448,7 +449,6 @@ var/global/wcColored
 /obj/structure/window/plasmabasic/New(Loc,re=0)
 	..()
 	ini_dir = dir
-	color = null
 	update_nearby_tiles(need_rebuild=1)
 	update_nearby_icons()
 	return
@@ -473,7 +473,6 @@ var/global/wcColored
 /obj/structure/window/plasmareinforced/New(Loc,re=0)
 	..()
 	ini_dir = dir
-	color = null
 	update_nearby_tiles(need_rebuild=1)
 	update_nearby_icons()
 	return