Fixes most of failing unit tests. (#127)

* Update living.dm * Update living.dm * mmi * lockers * Revert "Update living.dm" This reverts commit b7d7ea0. * Update LawankaOutpost.dmm * Revert "Update living.dm" This reverts commit 3dbbb25. * linters * Update misc.dm * hhmm * lists * linters * vars * Update clown.dm * Update yautja.dm * Update TGS_Talos.dmm * something like this? * xeno turrets spawner * Update infestation.dm * Update Assembler.js * hmmm * hmmmmmmmmmmmm * attempt 3 * Update _organ.dm * guh * Update human.dm * Update _organ.dm * bruh * Update mecha_equipment.dm * Update misc_item.dm * Update MarineDropship.js * Update Vending.tsx * hmmmm
PMC-Unga-Marines · Aug 26, 2024 · 58d5939 · 58d5939
1 parent 07f3179
commit 58d5939
Show file tree

Hide file tree

Showing 35 changed files with 127 additions and 178 deletions.
diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -7123,7 +7123,7 @@
 /turf/open/floor/tile/darkish,
 /area/bigredv2/outside/nanotrasen_lab/inside/garbledradio)
 "bAQ" = (
-/obj/structure/closet/secure_closet/security/science,
+/obj/structure/closet/secure_closet/security,
 /turf/open/floor/tile/dark,
 /area/bigredv2/outside/nanotrasen_lab/inside/garbledradio)
 "bAR" = (

diff --git a/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm b/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm
@@ -9659,7 +9659,7 @@
 	},
 /area/patricks_rest/surface/building/residential_cent)
 "VK" = (
-/obj/structure/closet/secure_closet/security/science,
+/obj/structure/closet/secure_closet/security,
 /turf/open/floor/mainship/red{
 	dir = 6
 	},

diff --git a/_maps/map_files/LV624/LV624.dmm b/_maps/map_files/LV624/LV624.dmm
@@ -4366,7 +4366,6 @@
 /area/lv624/ground/jungle3)
 "djk" = (
 /obj/structure/table,
-/obj/item/mmi/radio_enabled,
 /turf/open/floor/tile/brown{
 	dir = 9
 	},

diff --git a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm
@@ -21214,7 +21214,7 @@
 /area/lawankaoutpost/caves/nanotrasen_lab)
 "rRp" = (
 /obj/structure/rack,
-/obj/item/organ/brain/xeno,
+/obj/item/organ/brain,
 /obj/machinery/light{
 	dir = 4
 	},

diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
@@ -16205,23 +16205,6 @@
 	dir = 4
 	},
 /area/mainship/medical/medical_science)
-"jMv" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
-	dir = 4
-	},
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 8
-	},
-/turf/open/floor/plating/plating_catwalk/dark,
-/area/mainship/hallways/starboard_hallway)
 "jMw" = (
 /turf/open/floor/mainship/blue/corner{
 	dir = 8
@@ -28396,9 +28379,6 @@
 "qyq" = (
 /obj/machinery/door/airlock/mainship/generic/bathroom,
 /obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 8
 	},
@@ -79319,7 +79299,7 @@ nTH
 nTH
 nEU
 pYj
-jMv
+uYQ
 fIZ
 eWU
 eWU

diff --git a/_maps/map_files/Xeno_den/Xeno_den.dmm b/_maps/map_files/Xeno_den/Xeno_den.dmm
@@ -3,12 +3,12 @@
 /turf/closed/mineral/smooth/bluefrostwall/indestructible,
 /area/icy_caves/caves/northern)
 "b" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/northern)
 "c" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/east)
@@ -46,12 +46,12 @@
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/south)
 "m" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/east)
 "n" = (
 /obj/effect/landmark/weed_node,
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/east)
 "o" = (
@@ -77,7 +77,7 @@
 /turf/open/floor/plating/ground/ice,
 /area/deltastation/asteroidcaves)
 "u" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/south)
@@ -103,7 +103,7 @@
 /turf/closed/mineral/smooth/bluefrostwall/indestructible,
 /area/icy_caves/caves/northern)
 "C" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/west)
@@ -120,7 +120,7 @@
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/west)
 "H" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/plating/ground/ice,
 /area/deltastation/asteroidcaves)
@@ -147,11 +147,11 @@
 /turf/closed/mineral/smooth/bluefrostwall/indestructible,
 /area/icy_caves/caves/east)
 "S" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /turf/open/floor/plating/ground/ice,
 /area/icy_caves/caves/west)
 "T" = (
-/obj/structure/xeno/xeno_turret,
+/obj/effect/landmark/xeno_turret,
 /turf/open/floor/plating/ground/ice,
 /area/deltastation/asteroidcaves)
 "V" = (

diff --git a/_maps/map_files/deltastation/deltastation.dmm b/_maps/map_files/deltastation/deltastation.dmm
@@ -7075,7 +7075,6 @@
 /obj/structure/table/reinforced,
 /obj/item/tool/crowbar,
 /obj/item/tool/wrench,
-/obj/item/mmi,
 /obj/effect/turf_decal/tile/transparent/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/deltastation/ai_monitored/turret_protected/ai)
@@ -8711,9 +8710,6 @@
 /area/deltastation/maintenance/starboard/aft)
 "bND" = (
 /obj/structure/table/reinforced,
-/obj/item/mmi,
-/obj/item/mmi,
-/obj/item/mmi,
 /obj/structure/sign/securearea,
 /obj/machinery/light,
 /turf/open/floor/iron,
@@ -42491,7 +42487,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 32
 	},
-/obj/structure/closet/secure_closet/security/cargo,
+/obj/structure/closet/secure_closet/security,
 /obj/effect/turf_decal/tile/transparent/red/anticorner/contrasted{
 	dir = 4
 	},
@@ -49503,7 +49499,7 @@
 /area/deltastation/service/kitchen)
 "kdN" = (
 /obj/structure/cable,
-/obj/structure/closet/secure_closet/security/engine,
+/obj/structure/closet/secure_closet/security,
 /obj/structure/prop/camera,
 /obj/item/radio/intercom,
 /obj/machinery/power/apc/drained,
@@ -75208,8 +75204,6 @@
 "psS" = (
 /obj/structure/table/reinforced,
 /obj/item/robot_parts/chest,
-/obj/item/mmi,
-/obj/item/mmi,
 /obj/effect/turf_decal/tile/transparent/neutral/fourcorners,
 /obj/structure/extinguisher_cabinet,
 /obj/machinery/light{
@@ -77170,7 +77164,7 @@
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/transparent/red/fourcorners,
 /obj/effect/turf_decal/warning_stripes/box/empty,
-/obj/structure/closet/secure_closet/security/science,
+/obj/structure/closet/secure_closet/security,
 /turf/open/floor/iron,
 /area/deltastation/security/checkpoint/medical/medsci)
 "pKo" = (
@@ -94172,7 +94166,6 @@
 /area/deltastation/maintenance/port/fore)
 "tgL" = (
 /obj/structure/table/reinforced,
-/obj/item/mmi,
 /obj/effect/spawner/random/engineering/assemblies,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -98866,7 +98859,7 @@
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/transparent/red/fourcorners,
 /obj/effect/turf_decal/warning_stripes/box/empty,
-/obj/structure/closet/secure_closet/security/med,
+/obj/structure/closet/secure_closet/security,
 /turf/open/floor/iron,
 /area/deltastation/security/checkpoint/medical/medsci)
 "udQ" = (
@@ -104551,7 +104544,6 @@
 	},
 /obj/effect/turf_decal/tile/transparent/neutral/fourcorners,
 /obj/structure/table,
-/obj/item/mmi,
 /turf/open/floor/iron/dark,
 /area/deltastation/science/circuits)
 "vjm" = (

diff --git a/_maps/modularmaps/lv624/telecomms.dmm b/_maps/modularmaps/lv624/telecomms.dmm
@@ -312,7 +312,6 @@
 /area/lv624/lazarus/comms)
 "U" = (
 /obj/structure/table,
-/obj/item/mmi/radio_enabled,
 /turf/open/floor/tile/brown{
 	dir = 9
 	},

diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
@@ -147,7 +147,7 @@
 	return FALSE
 
 //Checks for specific type in a list
-/proc/type_in_list(var/type_to_chek, list/L)
+/proc/type_in_list(type_to_chek, list/L)
 	for(var/type in L)
 		if(type_to_chek == type)
 			return TRUE

diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
@@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(en_key_to_ru_key, list(
 	"," = "б", "." = "ю",
 ))
 
-/proc/convert_ru_key_to_en_key(var/_key)
+/proc/convert_ru_key_to_en_key(_key)
 	var/new_key = lowertext(_key)
 	new_key = GLOB.ru_key_to_en_key[new_key]
 	if(!new_key)

diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
@@ -97,6 +97,7 @@ GLOBAL_LIST_EMPTY(xeno_resin_door_turfs)
 GLOBAL_LIST_EMPTY(xeno_resin_wall_turfs)
 GLOBAL_LIST_EMPTY(xeno_tunnel_spawn_turfs)
 GLOBAL_LIST_EMPTY(xeno_jelly_pod_turfs)
+GLOBAL_LIST_EMPTY(xeno_turret_turfs)
 GLOBAL_LIST_EMPTY(xeno_resin_silos_by_hive)
 GLOBAL_LIST_EMPTY(xeno_resin_turrets_by_hive)
 GLOBAL_LIST_EMPTY(xeno_spawners_by_hive)

diff --git a/code/controllers/subsystem/cellauto.dm b/code/controllers/subsystem/cellauto.dm
@@ -1,11 +1,9 @@
-var/list/cellauto_cells = list()
-
 SUBSYSTEM_DEF(cellauto)
 	name = "Cellular Automata"
 	wait = 0.05 SECONDS
 	priority = FIRE_PRIORITY_CELLAUTO
 	flags = SS_NO_INIT
-
+	var/list/cellauto_cells = list()
 	var/list/currentrun = list()
 
 /datum/controller/subsystem/cellauto/stat_entry(msg)

diff --git a/code/datums/autocells/auto_cell.dm b/code/datums/autocells/auto_cell.dm
@@ -23,15 +23,15 @@
 
 	in_turf = our_turf
 	LAZYADD(in_turf.autocells, src)
-	cellauto_cells += src
+	SScellauto.cellauto_cells += src
 	birth()
 
 /datum/automata_cell/Destroy()
 	. = ..()
 	if(!QDELETED(in_turf))
 		LAZYREMOVE(in_turf.autocells, src)
 		in_turf = null
-	cellauto_cells -= src
+	SScellauto.cellauto_cells -= src
 	death()
 
 // Called when the cell is created

diff --git a/code/datums/gamemodes/infestation.dm b/code/datums/gamemodes/infestation.dm
@@ -32,6 +32,8 @@
 		new_tunnel.tunnel_desc = "["[get_area_name(new_tunnel)]"] (X: [new_tunnel.x], Y: [new_tunnel.y])"
 	for(var/i in GLOB.xeno_jelly_pod_turfs)
 		new /obj/structure/xeno/resin_jelly_pod(i, XENO_HIVE_NORMAL)
+	for(var/i in GLOB.xeno_turret_turfs)
+		new /obj/structure/xeno/xeno_turret(i, XENO_HIVE_NORMAL)
 
 /datum/game_mode/infestation/process()
 	if(round_finished)

diff --git a/code/datums/jobs/job/clown.dm b/code/datums/jobs/job/clown.dm
@@ -71,9 +71,9 @@ In addition, you are tasked with the security of high-ranking personnel, includi
 	if(!ismovable(target))
 		return ELEMENT_INCOMPATIBLE
 	if(isliving(target))
-		RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/LivingWaddle)
+		RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(LivingWaddle))
 	else
-		RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Waddle)
+		RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Waddle))
 
 /datum/element/waddling/Detach(datum/source, force)
 	. = ..()