CI

.github/workflows/ci_suite.yml

@@ -10,7 +10,7 @@ jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     concurrency:
       group: run_linters-${{ github.ref }}
       cancel-in-progress: true
@@ -56,7 +56,7 @@ jobs:
   compile_all_maps:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     concurrency:
       group: compile_all_maps-${{ github.ref }}
       cancel-in-progress: true
@@ -76,7 +76,7 @@ jobs:
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     services:
       mysql:
         image: mysql:latest
@@ -127,7 +127,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && always()"
     needs: [run_all_tests]
     name: Compare Screenshot Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       # If we ever add more artifacts, this is going to break, but it'll be obvious.

cev_eris.dme

@@ -171,6 +171,7 @@
 #include "code\ATMOSPHERICS\he_pipes.dm"
 #include "code\ATMOSPHERICS\mainspipe.dm"
 #include "code\ATMOSPHERICS\pipes.dm"
+#include "code\ATMOSPHERICS\tanks.dm"
 #include "code\ATMOSPHERICS\components\portables_connector.dm"
 #include "code\ATMOSPHERICS\components\tvalve.dm"
 #include "code\ATMOSPHERICS\components\valve.dm"
@@ -280,7 +281,6 @@
 #include "code\datums\callback.dm"
 #include "code\datums\category.dm"
 #include "code\datums\contract.dm"
-#include "code\datums\datacore.dm"
 #include "code\datums\datum.dm"
 #include "code\datums\datum_click_handlers.dm"
 #include "code\datums\datum_hud.dm"
@@ -750,14 +750,12 @@
 #include "code\game\machinery\computer\computer.dm"
 #include "code\game\machinery\computer\guestpass.dm"
 #include "code\game\machinery\computer\law.dm"
-#include "code\game\machinery\computer\medical.dm"
 #include "code\game\machinery\computer\message.dm"
 #include "code\game\machinery\computer\Operating.dm"
 #include "code\game\machinery\computer\pod.dm"
 #include "code\game\machinery\computer\prisoner.dm"
 #include "code\game\machinery\computer\prisonshuttle.dm"
 #include "code\game\machinery\computer\robot.dm"
-#include "code\game\machinery\computer\security.dm"
 #include "code\game\machinery\computer\station_alert.dm"
 #include "code\game\machinery\doors\airlock.dm"
 #include "code\game\machinery\doors\airlock_control.dm"
@@ -1457,6 +1455,7 @@
 #include "code\modules\asset_cache\asset_cache_item.dm"
 #include "code\modules\asset_cache\asset_list.dm"
 #include "code\modules\asset_cache\asset_list_items.dm"
+#include "code\modules\asset_cache\assets\legacyuiicons.dm"
 #include "code\modules\asset_cache\assets\sanity.dm"
 #include "code\modules\asset_cache\assets\sheetmaterials.dm"
 #include "code\modules\asset_cache\assets\stats.dm"
@@ -2276,6 +2275,7 @@
 #include "code\modules\nano\modules\human_appearance.dm"
 #include "code\modules\nano\modules\law_manager.dm"
 #include "code\modules\nano\modules\nano_module.dm"
+#include "code\modules\nano\modules\tgui_type.dm"
 #include "code\modules\onestar\generator.dm"
 #include "code\modules\onestar\os_cash.dm"
 #include "code\modules\onestar\os_turret.dm"
@@ -2465,7 +2465,9 @@
 #include "code\modules\projectiles\guns\projectile\battle_rifle\boltgun.dm"
 #include "code\modules\projectiles\guns\projectile\battle_rifle\kovacs.dm"
 #include "code\modules\projectiles\guns\projectile\battle_rifle\levergun.dm"
+#include "code\modules\projectiles\guns\projectile\modular\interactions.dm"
 #include "code\modules\projectiles\guns\projectile\modular\modular_AK.dm"
+#include "code\modules\projectiles\guns\projectile\modular\modular_bolt.dm"
 #include "code\modules\projectiles\guns\projectile\modular\modular_MK58.dm"
 #include "code\modules\projectiles\guns\projectile\modular\modular_wintermute.dm"
 #include "code\modules\projectiles\guns\projectile\other\RPG.dm"

code/ATMOSPHERICS/atmospherics.dm

@@ -48,7 +48,7 @@ Pipelines + Other Objects -> Pipe network
 
 /obj/machinery/atmospherics/Destroy()
 	GLOB.atmos_machinery -= src
-	..()
+	. = ..()
 
 /obj/machinery/atmospherics/proc/atmos_init()
 	return

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -56,7 +56,7 @@
 		node2.disconnect(src)
 		QDEL_NULL(network2)
 		node2 = null
-	..()
+	. = ..()
 
 
 /obj/machinery/atmospherics/binary/atmos_init()

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -28,7 +28,7 @@
 		node1.disconnect(src)
 		QDEL_NULL(network)
 		node1 = null
-	..()
+	. = ..()
 
 
 /obj/machinery/atmospherics/unary/atmos_init()

code/ATMOSPHERICS/pipes.dm

@@ -72,8 +72,6 @@
 	return QDEL_HINT_QUEUE
 
 /obj/machinery/atmospherics/pipe/attackby(obj/item/I, mob/user)
-	if (istype(src, /obj/machinery/atmospherics/pipe/tank))
-		return ..()
 	if (istype(src, /obj/machinery/atmospherics/pipe/vent))
 		return ..()
 
@@ -130,8 +128,6 @@
 */
 
 /obj/machinery/atmospherics/pipe/color_cache_name(var/obj/machinery/atmospherics/node)
-	if(istype(src, /obj/machinery/atmospherics/pipe/tank))
-		return ..()
 
 	if(istype(node, /obj/machinery/atmospherics/pipe/manifold) || istype(node, /obj/machinery/atmospherics/pipe/manifold4w))
 		if(pipe_color == node.pipe_color)
@@ -1034,166 +1030,6 @@
 	icon_connect_type = "-supply"
 	color = PIPE_COLOR_BLUE
 
-
-/obj/machinery/atmospherics/pipe/tank
-	icon = 'icons/atmos/tank.dmi'
-	icon_state = "air_map"
-
-	name = "Pressure Tank"
-	desc = "A large vessel containing pressurized gas."
-
-	volume = 10000 //in liters, 1 meters by 1 meters by 2 meters ~tweaked it a little to simulate a pressure tank without needing to recode them yet
-	var/start_pressure = 25*ONE_ATMOSPHERE
-
-	level = BELOW_PLATING_LEVEL
-	dir = SOUTH
-	initialize_directions = SOUTH
-	density = TRUE
-	layer = ABOVE_WINDOW_LAYER
-
-/obj/machinery/atmospherics/pipe/tank/LateInitialize()
-	icon_state = "air"
-	initialize_directions = dir
-	..()
-
-/obj/machinery/atmospherics/pipe/tank/Process()
-	if(!parent)
-		..()
-	else
-		. = PROCESS_KILL
-
-/obj/machinery/atmospherics/pipe/tank/Destroy()
-	if(node1)
-		node1.disconnect(src)
-
-	. = ..()
-
-/obj/machinery/atmospherics/pipe/tank/pipeline_expansion()
-	return list(node1)
-
-/obj/machinery/atmospherics/pipe/tank/update_underlays()
-	if(..())
-		underlays.Cut()
-		var/turf/T = get_turf(src)
-		if(!istype(T))
-			return
-		add_underlay(T, node1, dir)
-
-/obj/machinery/atmospherics/pipe/tank/hide()
-	update_underlays()
-
-/obj/machinery/atmospherics/pipe/tank/atmos_init()
-	var/connect_direction = dir
-
-	for(var/obj/machinery/atmospherics/target in get_step(src, connect_direction))
-		if(target.initialize_directions & get_dir(target, src))
-			if (check_connect_types(target, src))
-				node1 = target
-				break
-
-	update_underlays()
-
-/obj/machinery/atmospherics/pipe/tank/disconnect(obj/machinery/atmospherics/reference)
-	if(reference == node1)
-		if(istype(node1, /obj/machinery/atmospherics/pipe))
-			QDEL_NULL(parent)
-		node1 = null
-
-	update_underlays()
-
-	return null
-
-/obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob)
-	if(istype(W, /obj/item/device/pipe_painter))
-		return
-
-/obj/machinery/atmospherics/pipe/tank/air
-	name = "Pressure Tank (Air)"
-	icon_state = "air_map"
-
-/obj/machinery/atmospherics/pipe/tank/air/LateInitialize()
-	air_temporary = new
-	air_temporary.volume = volume
-	air_temporary.temperature = T20C
-
-	air_temporary.adjust_multi("oxygen",  (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \
-	                           "nitrogen",(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
-
-
-	..()
-	icon_state = "air"
-
-/obj/machinery/atmospherics/pipe/tank/oxygen
-	name = "Pressure Tank (Oxygen)"
-	icon_state = "o2_map"
-
-/obj/machinery/atmospherics/pipe/tank/oxygen/LateInitialize()
-	air_temporary = new
-	air_temporary.volume = volume
-	air_temporary.temperature = T20C
-
-	air_temporary.adjust_gas("oxygen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
-
-	..()
-	icon_state = "o2"
-
-/obj/machinery/atmospherics/pipe/tank/nitrogen
-	name = "Pressure Tank (Nitrogen)"
-	icon_state = "n2_map"
-
-/obj/machinery/atmospherics/pipe/tank/nitrogen/LateInitialize()
-	air_temporary = new
-	air_temporary.volume = volume
-	air_temporary.temperature = T20C
-
-	air_temporary.adjust_gas("nitrogen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
-
-	..()
-	icon_state = "n2"
-
-/obj/machinery/atmospherics/pipe/tank/carbon_dioxide
-	name = "Pressure Tank (Carbon Dioxide)"
-	icon_state = "co2_map"
-
-/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/LateInitialize()
-	air_temporary = new
-	air_temporary.volume = volume
-	air_temporary.temperature = T20C
-
-	air_temporary.adjust_gas("carbon_dioxide", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
-
-	..()
-	icon_state = "co2"
-
-/obj/machinery/atmospherics/pipe/tank/plasma
-	name = "Pressure Tank (Plasma)"
-	description_antag = "Will blind people if they do not wear face-covering gear"
-	icon_state = "plasma_map"
-
-/obj/machinery/atmospherics/pipe/tank/plasma/LateInitialize()
-	air_temporary = new
-	air_temporary.volume = volume
-	air_temporary.temperature = T20C
-
-	air_temporary.adjust_gas("plasma", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
-
-	..()
-	icon_state = "plasma"
-
-/obj/machinery/atmospherics/pipe/tank/nitrous_oxide
-	name = "Pressure Tank (Nitrous Oxide)"
-	icon_state = "n2o_map"
-
-/obj/machinery/atmospherics/pipe/tank/nitrous_oxide/LateInitialize()
-	air_temporary = new
-	air_temporary.volume = volume
-	air_temporary.temperature = T0C
-
-	air_temporary.adjust_gas("sleeping_agent", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
-
-	..()
-	icon_state = "n2o"
-
 /obj/machinery/atmospherics/pipe/vent
 	icon = 'icons/obj/atmospherics/pipe_vent.dmi'
 	icon_state = "intact"