Merge remote-tracking branch 'origin/master' into pathology-tweaks

Monkestation · Mar 28, 2024 · 852676e · 852676e
2 parents 10849e4 + 0eb8aa8
commit 852676e
Show file tree

Hide file tree

Showing 386 changed files with 8,886 additions and 6,804 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -37,7 +37,7 @@
 /turf/open/floor/catwalk_floor/iron,
 /area/ruin/planetengi)
 "as" = (
-/obj/machinery/modular_computer/console/preset/civilian{
+/obj/machinery/modular_computer/preset/civilian{
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/yellow/filled/warning{

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm
@@ -62,7 +62,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/powered/mailroom)
 "gO" = (
-/obj/machinery/modular_computer/console/preset/civilian{
+/obj/machinery/modular_computer/preset/civilian{
 	dir = 4
 	},
 /turf/open/floor/carpet/green,
@@ -128,7 +128,7 @@
 /turf/open/floor/carpet/royalblack,
 /area/ruin/powered/mailroom)
 "lw" = (
-/obj/machinery/modular_computer/console/preset/civilian{
+/obj/machinery/modular_computer/preset/civilian{
 	dir = 8
 	},
 /turf/open/floor/carpet/green,

diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -611,7 +611,7 @@
 	health = 25;
 	maxHealth = 25;
 	name = "hatchling";
-	resize = 0.85
+	current_size = 0.85
 	},
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost)
@@ -627,7 +627,7 @@
 	health = 25;
 	maxHealth = 25;
 	name = "hatchling";
-	resize = 0.85
+	current_size = 0.85
 	},
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost)
@@ -1467,7 +1467,7 @@
 	health = 25;
 	maxHealth = 25;
 	name = "hatchling";
-	resize = 0.85
+	current_size = 0.85
 	},
 /turf/open/misc/asteroid,
 /area/ruin/space/has_grav/derelictoutpost)

diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -338,7 +338,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/hellfactoryoffice)
 "bg" = (
-/obj/machinery/modular_computer/console/preset/civilian,
+/obj/machinery/modular_computer/preset/civilian,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hellfactory)
 "bh" = (

diff --git a/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm b/_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
@@ -215,7 +215,7 @@
 	pixel_y = -4;
 	pixel_x = -7
 	},
-/obj/item/camera_bug{
+/obj/item/computer_disk/syndicate/camera_app{
 	pixel_x = -5;
 	pixel_y = 9
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -5278,7 +5278,7 @@
 /area/ruin/space/ancientstation/charlie/hall)
 "we" = (
 /obj/machinery/light/small/directional/north,
-/obj/machinery/modular_computer/console/preset/engineering,
+/obj/machinery/modular_computer/preset/engineering,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "wg" = (

diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -215,7 +215,7 @@
 "aS" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light/directional/south,
-/obj/item/camera_bug,
+/obj/item/computer_disk/syndicate/camera_app,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/turretedoutpost)
 "aT" = (

diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm
@@ -2142,7 +2142,7 @@
 	name = "Loading Doors";
 	pixel_y = 6
 	},
-/obj/machinery/modular_computer/console/preset{
+/obj/machinery/modular_computer/preset{
 	dir = 8
 	},
 /turf/open/floor/iron,

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -1,4 +1,4 @@
-//area#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
+//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
 
 #include "map_files\generic\CentCom.dmm"