Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
2017-02-28 09:30:49 -06:00
parent 93782cf716
commit 0bca862419
544 changed files with 309981 additions and 81206 deletions
@@ -100,7 +100,7 @@

 	if (atmos_overlay_types)
 		for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
-			overlays -= overlay
+			cut_overlay(overlay)

 	if (new_overlay_types.len)
 		if (atmos_overlay_types)
@@ -133,7 +133,7 @@
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
 		pixel_y = (dir & 3)? (dir == 1 ? -24 : 24) : 0

-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	if(name == initial(name))
 		name = "[A.name] Air Alarm"

@@ -311,7 +311,7 @@
 			send_signal(device_id, list("checks" = text2num(params["val"])^2))
 			. = TRUE
 		if("set_external_pressure")
-			var/area/A = get_area_master(src)
+			var/area/A = get_area(src)
 			var/target = input("New target pressure:", name, A.air_vent_info[device_id]["external"]) as num|null
 			if(!isnull(target) && !..())
 				send_signal(device_id, list("set_external_pressure" = target))
@@ -337,12 +337,12 @@
 			apply_mode()
 			. = TRUE
 		if("alarm")
-			var/area/A = get_area_master(src)
+			var/area/A = get_area(src)
 			if(A.atmosalert(2, src))
 				post_alert(2)
 			. = TRUE
 		if("reset")
-			var/area/A = get_area_master(src)
+			var/area/A = get_area(src)
 			if(A.atmosalert(0, src))
 				post_alert(0)
 			. = TRUE
@@ -374,7 +374,7 @@
 		return 0

 /obj/machinery/airalarm/proc/refresh_all()
-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	for(var/id_tag in A.air_vent_names)
 		var/list/I = A.air_vent_info[id_tag]
 		if(I && I["timestamp"] + AALARM_REPORT_TIMEOUT / 2 > world.time)
@@ -409,7 +409,7 @@
 	return 1

 /obj/machinery/airalarm/proc/apply_mode()
-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	switch(mode)
 		if(AALARM_MODE_SCRUBBING)
 			for(var/device_id in A.air_scrub_names)
@@ -541,7 +541,7 @@
 		icon_state = "alarmp"
 		return

-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	switch(max(danger_level, A.atmosalm))
 		if(0)
 			icon_state = "alarm0"
@@ -596,7 +596,7 @@
 	if(!frequency)
 		return

-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)

 	var/datum/signal/alert_signal = new
 	alert_signal.source = src
@@ -614,7 +614,7 @@
 	frequency.post_signal(src, alert_signal,null,-1)

 /obj/machinery/airalarm/proc/apply_danger_level()
-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)

 	var/new_area_danger_level = 0
 	for(var/area/R in A.related)
@@ -48,7 +48,7 @@
 		id_tag = num2text(uid)

 /obj/machinery/atmospherics/components/unary/vent_pump/Destroy()
-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	A.air_vent_names -= id_tag
 	A.air_vent_info -= id_tag

@@ -165,7 +165,7 @@
 		"sigtype" = "status"
 	)

-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	if(!A.air_vent_names[id_tag])
 		name = "\improper [A.name] vent pump #[A.air_vent_names.len + 1]"
 		A.air_vent_names[id_tag] = name
@@ -40,7 +40,7 @@
 		id_tag = num2text(uid)

 /obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy()
-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	A.air_scrub_names -= id_tag
 	A.air_scrub_info -= id_tag

@@ -131,7 +131,7 @@
 		"sigtype" = "status"
 	)

-	var/area/A = get_area_master(src)
+	var/area/A = get_area(src)
 	if(!A.air_scrub_names[id_tag])
 		name = "\improper [A.name] air scrubber #[A.air_scrub_names.len + 1]"
 		A.air_scrub_names[id_tag] = name
@@ -108,3 +108,13 @@

 /obj/machinery/atmospherics/pipe/manifold/green/hidden
 	level = 1
+
+/obj/machinery/atmospherics/pipe/manifold/orange
+	pipe_color=rgb(255,127,39)
+	color=rgb(255,127,39)
+
+/obj/machinery/atmospherics/pipe/manifold/orange/visible
+	level = 2
+
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden
+	level = 1
@@ -99,3 +99,13 @@

 /obj/machinery/atmospherics/pipe/manifold4w/green/hidden
 	level = 1
+
+/obj/machinery/atmospherics/pipe/manifold4w/orange
+	pipe_color=rgb(255,127,39)
+	color=rgb(255,127,39)
+
+/obj/machinery/atmospherics/pipe/manifold4w/orange/visible
+	level = 2
+
+/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden
+	level = 1
@@ -110,3 +110,13 @@ The regular pipe you see everywhere, including bent ones.

 /obj/machinery/atmospherics/pipe/simple/green/hidden
 	level = 1
+
+/obj/machinery/atmospherics/pipe/simple/orange
+	pipe_color=rgb(255,127,39)
+	color=rgb(255,127,39)
+
+/obj/machinery/atmospherics/pipe/simple/orange/visible
+	level = 2
+
+/obj/machinery/atmospherics/pipe/simple/orange/hidden
+	level = 1