smartpipes tried to sneak in, begone!

This reverts commit 9a4e856.
BeeStation · Aug 19, 2024 · 07c00e7 · 07c00e7
1 parent 9a4e856
commit 07c00e7
Show file tree

Hide file tree

Showing 63 changed files with 479 additions and 3,559 deletions.
diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm
@@ -2,7 +2,7 @@
 ///Check if the turfs allows gas passage based on density, do not use.
 #define CANATMOSPASS(A, O) ( A.can_atmos_pass == ATMOS_PASS_PROC ? A.can_atmos_pass(O) : ( A.can_atmos_pass == ATMOS_PASS_DENSITY ? !A.density : A.can_atmos_pass ) )
 ///Check if the turfs allows gas passage on a z level, do not use.
-#define CANVERTICALATMOSPASS(A, O) ( A.can_atmos_pass_vertical == ATMOS_PASS_PROC ? A.can_atmos_pass(O, TRUE) : ( A.can_atmos_pass_vertical == ATMOS_PASS_DENSITY ? !A.density : A.can_atmos_pass_vertical ) )
+#define CANVERTICALATMOSPASS(A, O) ( A.can_atmos_passVertical == ATMOS_PASS_PROC ? A.can_atmos_pass(O, TRUE) : ( A.can_atmos_passVertical == ATMOS_PASS_DENSITY ? !A.density : A.can_atmos_passVertical ) )
 
 //Helpers
 ///Moves the icon of the device based on the piping layer and on the direction

diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
@@ -623,12 +623,9 @@ GLOBAL_LIST_EMPTY(colored_images)
 	if(!pipe_init_dirs_cache[type])
 		pipe_init_dirs_cache[type] = list()
 
-	if(!pipe_init_dirs_cache[type]["[init_dir]"])
-		pipe_init_dirs_cache[type]["[init_dir]"] = list()
-
-	if(!pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"])
-		var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir, init_dir)
-		pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"] = temp.get_init_directions()
+	if(!pipe_init_dirs_cache[type]["[dir]"])
+		var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir)
+		pipe_init_dirs_cache[type]["[dir]"] = temp.get_init_directions()
 		qdel(temp)
 
 	return pipe_init_dirs_cache[type]["[dir]"]

diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -193,7 +193,7 @@
 
 /obj/effect/particle_effect/foam/proc/spread_foam()
 	var/turf/t_loc = get_turf(src)
-	for(var/turf/T in t_loc.get_atmos_adjacent_turfs())
+	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
 		var/obj/effect/particle_effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam!
 		if(foundfoam)
 			continue

diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -91,7 +91,7 @@
 	if(!t_loc)
 		return
 	var/list/newsmokes = list()
-	for(var/turf/T in t_loc.get_atmos_adjacent_turfs())
+	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs(!circle))
 		var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
 		if(foundsmoke)
 			continue

diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
@@ -143,12 +143,10 @@
 	if(istype(atmos_source))
 		if(istype(atmos_destination) && !atmos_source.Adjacent(atmos_destination) && !CANATMOSPASS(atmos_destination, atmos_source))
 			LAZYREMOVE(atmos_source.atmos_adjacent_turfs, atmos_destination)
-			atmos_source.immediate_calculate_adjacent_turfs() //Just in case they were next to each other
 		atmos_source = null
 	if(istype(atmos_destination))
 		if(istype(atmos_source) && !atmos_destination.Adjacent(atmos_source) && !CANATMOSPASS(atmos_source, atmos_destination))
 			LAZYREMOVE(atmos_destination.atmos_adjacent_turfs, atmos_source)
-			atmos_destination.immediate_calculate_adjacent_turfs()
 		atmos_destination = null
 
 /obj/effect/portal/Destroy(force)				//Calls on_portal_destroy(destroyed portal, location of destroyed portal) on creator if creator has such call.

diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
@@ -30,10 +30,10 @@
 	oxygen_mix.gases[/datum/gas/oxygen][MOLES] = pressure_o*oxygen_mix.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))
 	oxygen_mix.temperature = CELSIUS_TO_KELVIN(temp_o)
 
-	V.tank_one = plasma_tank
-	V.tank_two = oxygen_tank
-	plasma_tank.master = V
-	oxygen_tank.master = V
+	V.tank_one = PT
+	V.tank_two = OT
+	PT.master = V
+	OT.master = V
 
 	if(assembly_type)
 		var/obj/item/assembly/A = new assembly_type(V)

diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
@@ -198,8 +198,8 @@
 	var/turf/previousturf = get_turf(src)
 	for(var/turf/T in turflist)
 		if(T == previousturf)
-			continue //so we don't burn the tile we be standin on
-		var/list/turfs_sharing_with_prev = previousturf.get_atmos_adjacent_turfs(alldir=1)
+			continue	//so we don't burn the tile we be standin on
+		var/list/turfs_sharing_with_prev = previousturf.GetAtmosAdjacentTurfs(alldir=1)
 		if(!(T in turfs_sharing_with_prev))
 			break
 		if(igniter)

diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
@@ -185,8 +185,8 @@
 		qdel(src)
 		return FALSE
 
-	for(var/turf/T in U.get_atmos_adjacent_turfs())
-		if(locate(/obj/structure/alien/weeds) in T)
+	for(var/turf/T in U.GetAtmosAdjacentTurfs())
+		if((locate(/obj/structure/alien/weeds) in T))
 			continue
 
 		if(is_type_in_typecache(T, blacklisted_turfs))

diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
@@ -109,9 +109,6 @@
 	ADD_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC)
 	air_update_turf(TRUE, TRUE)
 
-/obj/structure/holosign/barrier/atmos/block_superconductivity() //Didn't used to do this, but it's "normal", and will help ease heat flow transitions with the players.
-	return TRUE
-
 /obj/structure/holosign/barrier/atmos/Destroy()
 	var/turf/local = get_turf(loc)
 	REMOVE_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC)

diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
@@ -26,10 +26,10 @@
 	var/created_name = null
 
 	//Vars to help with the icon's name
-	var/facing = "l" //Does the windoor open to the left or right?
-	var/secure = FALSE //Whether or not this creates a secure windoor
-	var/state = "01" //How far the door assembly has progressed
-	can_atmos_pass = ATMOS_PASS_PROC
+	var/facing = "l"	//Does the windoor open to the left or right?
+	var/secure = FALSE		//Whether or not this creates a secure windoor
+	var/state = "01"	//How far the door assembly has progressed
+
 
 /obj/structure/windoor_assembly/Initialize(mapload, loc, set_dir)
 	. = ..()

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -467,10 +467,7 @@
 	explosion_block = 2
 	glass_type = /obj/item/stack/sheet/plasmarglass
 
-/obj/structure/window/reinforced/plasma/block_superconductivity()
-	return TRUE
-
-/obj/structure/window/reinforced/plasma/spawner/east
+/obj/structure/window/plasma/reinforced/spawner/east
 	dir = EAST
 
 /obj/structure/window/plasma/reinforced/spawner/west

diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
@@ -8,8 +8,7 @@
 	icon = 'icons/turf/shuttle.dmi'
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	max_integrity = 500
-	armor = list(MELEE = 100, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70) //default + ignores melee
-	can_atmos_pass = ATMOS_PASS_DENSITY
+	armor = list(MELEE = 100,  BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70, STAMINA = 0) //default + ignores melee
 
 /obj/structure/shuttle/engine
 	name = "engine"

diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
@@ -131,7 +131,7 @@
 	floor_tile = null
 	var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance
 	can_atmos_pass = ATMOS_PASS_NO
-	can_atmos_pass_vertical =	ATMOS_PASS_NO
+	can_atmos_passVertical =	ATMOS_PASS_NO
 
 
 /turf/open/floor/engine/cult/Initialize(mapload)

diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm
@@ -3,7 +3,7 @@
 	desc = "Watch your step!"
 	icon_state = "invisible"
 	baseturfs = /turf/open/openspace
-	can_atmos_pass_vertical = ATMOS_PASS_YES
+	can_atmos_passVertical = ATMOS_PASS_YES
 	overfloor_placed = FALSE
 	underfloor_accessibility = UNDERFLOOR_INTERACTABLE
 	allow_z_travel = TRUE