Merge pull request #180 from Markolie/master

Shuttle fixes

code/controllers/shuttle_controller.dm

@@ -134,7 +134,7 @@ var/global/datum/shuttle_controller/shuttle_controller
 	admin_shuttle.area_offsite = locate(/area/shuttle/administration/centcom)
 	admin_shuttle.area_station = locate(/area/shuttle/administration/station)
 	admin_shuttle.docking_controller_tag = "admin_shuttle_port"
-	admin_shuttle.docking_controller_tag_station = "admin_shuttle_starboard"
+	admin_shuttle.docking_controller_tag_station = "admin_shuttle_port"
 	admin_shuttle.docking_controller_tag_offsite = "admin_shuttle_port"
 	admin_shuttle.dock_target_station = "admin_shuttle_dock_airlock"
 	admin_shuttle.dock_target_offsite = "admin_shuttle_bay"

code/game/machinery/Sleeper.dm

@@ -242,6 +242,8 @@
 /obj/machinery/sleeper/upgraded/New()
 	..()
 	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/sleeper(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src)
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)

code/game/machinery/autolathe.dm

@@ -55,7 +55,18 @@
 
 	wires = new(src)
 	files = new /datum/research/autolathe(src)
-
+	
+/obj/machinery/autolathe/upgraded/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/autolathe(null)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+	RefreshParts()
+	
 /obj/machinery/autolathe/interact(mob/user)
 	if(shocked && !(stat & NOPOWER))
 		shock(user,50)

code/game/machinery/cryo.dm

@@ -35,6 +35,18 @@
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/stack/cable_coil(src, 1)
 	RefreshParts()
+	
+/obj/machinery/atmospherics/unary/cryo_cell/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/cryo_tube(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 1)
+	RefreshParts()
 
 /obj/machinery/atmospherics/unary/cryo_cell/RefreshParts()
 	var/C

code/game/machinery/doors/windowdoor.dm

@@ -18,7 +18,8 @@
 		src.icon_state = "[src.icon_state]"
 		src.base_state = src.icon_state
 
-	color = color_windows(src)
+	if(!color)
+		color = color_windows(src)
 	return
 
 /obj/machinery/door/window/Destroy()

code/game/mecha/mech_fabricator.dm

@@ -59,6 +59,17 @@
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
 	RefreshParts()
 	files = new /datum/research(src) //Setup the research data holder.
+	
+/obj/machinery/mecha_part_fabricator/upgraded/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/mechfab(null)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+	RefreshParts()
 
 /obj/machinery/mecha_part_fabricator/RefreshParts()
 	var/T = 0

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

code/modules/mob/living/carbon/human/human_damage.dm

@@ -17,12 +17,12 @@
 		var/datum/organ/external/H = organs_by_name["head"]
 		if (!H.amputated)
 			if ((health >= (config.health_threshold_dead/100*75)) && stat == DEAD)  //need to get them 25% away from death point before reviving synthetics
-				revive()
+				update_revive()
 	if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
-		revive()
+		update_revive()
 	return
 	
-/mob/living/carbon/human/revive() // handles revival through other means that cloning (defib, IPC repair)
+/mob/living/carbon/human/proc/update_revive() // handles revival through other means that cloning or adminbus (defib, IPC repair)
 	stat = CONSCIOUS
 	dead_mob_list -= src
 	living_mob_list |= src