Merge pull request #375 from caelaislinn/master

bug / map fixes

baystation12.dme

@@ -144,7 +144,10 @@
 #define FILE_DIR "code/unused/spacecraft"
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
 #define FILE_DIR "code/WorkInProgress/organs"
@@ -176,6 +179,7 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
+#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"

code/WorkInProgress/Cael_Aislinn/MultiZ.dm

@@ -174,9 +174,36 @@
 						H.apply_damage(0.5*damage, BRUTE, "l_arm")
 						H.apply_damage(0.5*damage, BRUTE, "r_arm")
 
-						//var/obj/effect/decal/cleanable/blood/B = new(src.loc)
+/*
-						//B.blood_DNA = H.dna.unique_enzymes
+/obj/effect/decal/cleanable/blood
-						//B.blood_type = H.b_type
+	name = "Blood"
+	desc = "It's red and disgusting."
+	density = 0
+	anchored = 1
+	layer = 2
+	icon = 'blood.dmi'
+	icon_state = "floor1"
+	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
+	var/list/viruses = list()
+	blood_DNA = list()
+	var/datum/disease2/disease/virus2 = null
+	var/OriginalMob = null
+
+	Del()
+		for(var/datum/disease/D in viruses)
+			D.cure(0)
+		..()
+*/
+
+						var/obj/effect/decal/cleanable/blood/B = new(src.loc)
+						var/list/blood_DNA_temp[1]
+						blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type)
+						B.blood_DNA =  blood_DNA_temp
+						B.virus2 = H.virus2
+						for(var/datum/disease/D in H.viruses)
+							var/datum/disease/newDisease = new D.type
+							B.viruses += newDisease
+							newDisease.holder = B
 
 						H:weakened = max(H:weakened,2)
 						H:updatehealth()

code/game/machinery/autolathe.dm

@@ -185,45 +185,48 @@
 			usr << "\red The autolathe is busy. Please wait for completion of previous operation."
 	if (!busy)
 		if(href_list["make"])
-			makeNew:
+			while(outputAmount > 0)
-			var/turf/T = src.loc
+				var/turf/T = src.loc
-			var/obj/template = locate(href_list["make"])
+				var/obj/template = locate(href_list["make"])
-			var/multiplier = text2num(href_list["multiplier"])
+				var/multiplier = text2num(href_list["multiplier"])
-			if (!multiplier) multiplier = 1
+				if (!multiplier) multiplier = 1
-			var/power = max(2000, (template.m_amt+template.g_amt)*multiplier/5)
+				var/power = max(2000, (template.m_amt+template.g_amt)*multiplier/5)
-			if(src.m_amount >= template.m_amt*multiplier && src.g_amount >= template.g_amt*multiplier)
+				if( (src.m_amount >= template.m_amt*multiplier) && (src.g_amount >= template.g_amt*multiplier) )
-				busy = 1
-				use_power(power)
-				icon_state = "autolathe"
-				flick("autolathe_n",src)
-				spawn(16)
 					use_power(power)
+					icon_state = "autolathe"
+					flick("autolathe_n",src)
 					spawn(16)
-						use_power(power)
+						if(!busy)
-						spawn(16)
+							busy = 1
-							src.m_amount -= template.m_amt*multiplier
+							use_power(power)
-							src.g_amount -= template.g_amt*multiplier
+							flick("autolathe_n",src)
-							if(src.m_amount < 0)
+							spawn(16)
-								src.m_amount = 0
+								use_power(power)
-							if(src.g_amount < 0)
+								flick("autolathe_n",src)
-								src.g_amount = 0
+								spawn(16)
-							var/obj/new_item = new template.type(src)
+									flick("autolathe_n",src)
-							for(var/obj/item/weapon/storage/container in src.contents)
+									src.m_amount -= template.m_amt*multiplier
-								container.attackby(new_item)
+									src.g_amount -= template.g_amt*multiplier
-								if(new_item.loc == container)
+									if(src.m_amount < 0)
-									break
+										src.m_amount = 0
-							if (multiplier>1)
+									if(src.g_amount < 0)
-								var/obj/item/stack/S = new_item
+										src.g_amount = 0
-								S.amount = multiplier
+									var/obj/new_item = new template.type(src)
-							if(new_item in src)
+									for(var/obj/item/weapon/storage/container in src.contents)
-								new_item.loc = T
+										container.attackby(new_item)
-							src.updateUsrDialog()
+										if(new_item.loc == container)
-							outputAmount -= 1
+											break
-							if(outputAmount > 0)
+									if (multiplier>1)
-								goto makeNew
+										var/obj/item/stack/S = new_item
-							busy = 0
+										S.amount = multiplier
-			else
+									if(new_item in src)
-				outputAmount = 1
+										new_item.loc = T
+									src.updateUsrDialog()
+									outputAmount -= 1
+									busy = 0
+				else
+					outputAmount = 1
+					break
 		if(href_list["act"])
 			var/temp_wire = href_list["wire"]
 			if(href_list["act"] == "pulse")

code/game/machinery/computer/camera_monitor.dm

@@ -6,9 +6,9 @@
 		else
 			switch(department)
 				if("Security")
-					networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo")
+					networks = list("Arrivals","SS13","Engineering","Research","Medbay","Tcomsat","Mess Hall","Security","Atmospherics","Cargo","Command","Solars")
 				if("Engineering")
-					networks = list("Engineering","Tcomsat","Singularity","Atmospherics")
+					networks = list("Engineering","Tcomsat","Singularity","Atmospherics","Solars")
 				if("Research")
 					networks = list("Research","Bomb Testing")
 				if("Medbay")

code/game/mecha/mech_bay.dm

@@ -31,7 +31,7 @@
 
 	proc/init_devices()
 		recharge_console = locate() in range(1,src)
-		recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir))	//gets the recharge poyrt from the facing dir
+		recharge_port = locate(/obj/machinery/mech_bay_recharge_port, get_step(src, dir))	//gets the recharge port from the facing dir
 		if(recharge_console)
 			recharge_console.recharge_floor = src
 			if(recharge_port)

maps/tgstation.2.0.8.dmm

@@ -4068,7 +4068,7 @@
 "bAl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bAm" = (/obj/machinery/power/apc{dir = 4; name = "Surgery APC"; pixel_x = 25},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bAn" = (/turf/simulated/wall/r_wall,/area/medical/surgery)
-"bAo" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/power/apc{dir = 1; name = "RD's Office APC"; pixel_x = -25; pixel_y = 0},/obj/structure/cable{d2 = 2; icon_state = "0-4"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
+"bAo" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/power/apc{dir = 8; name = "RD's Office APC"; pixel_x = -25; pixel_y = 0},/obj/structure/cable{d2 = 2; icon_state = "0-4"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
 "bAp" = (/obj/structure/stool/chair{dir = 1},/obj/structure/cable{d2 = 2; icon_state = "4-8"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
 "bAq" = (/obj/structure/cable{d2 = 2; icon_state = "4-8"; pixel_y = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
 "bAr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "2-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/keycard_auth{pixel_x = -25; pixel_y = 32},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/hor)
@@ -4647,7 +4647,7 @@
 "bLs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/assembly/chargebay)
 "bLt" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1},/turf/simulated/floor,/area/assembly/chargebay)
 "bLu" = (/obj/machinery/mech_bay_recharge_port,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/assembly/chargebay)
-"bLv" = (/turf/simulated/floor/mech_bay_recharge_floor,/area/assembly/chargebay)
+"bLv" = (/turf/simulated/floor/mech_bay_recharge_floor{dir = 8},/area/assembly/chargebay)
 "bLw" = (/obj/machinery/computer/mech_bay_power_console,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/grid,/area/assembly/chargebay)
 "bLx" = (/obj/machinery/door/poddoor{id = "Skynet_launch"; name = "Recharge Bay"; req_access_txt = "22"},/turf/simulated/floor,/area/assembly/chargebay)
 "bLy" = (/turf/simulated/floor{dir = 4; icon_state = "loadingarea"; tag = "loading"},/area/hallway/primary/aft)