diff --git a/_maps/RandomZLevels/maintsroom.dmm b/_maps/RandomZLevels/maintsroom.dmm
index a0bba3acee1..7ebb2cb5ebe 100644
--- a/_maps/RandomZLevels/maintsroom.dmm
+++ b/_maps/RandomZLevels/maintsroom.dmm
@@ -1530,7 +1530,7 @@
 /turf/open/floor/wood,
 /area/awaymission/caves/maintsroom)
 "fc" = (
-/mob/living/simple_animal/bot/secbot/pingsky{
+/mob/living/basic/bot/secbot/pingsky{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/circuit/red,
@@ -12268,7 +12268,7 @@
 /turf/open/floor/white,
 /area/awaymission/caves/maintsroom)
 "NW" = (
-/mob/living/simple_animal/bot/secbot/beepsky/officer{
+/mob/living/basic/bot/secbot/beepsky/officer{
 	faction = list("hostile","cult")
 	},
 /obj/machinery/light/red/directional/north,
@@ -12713,7 +12713,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/maintsroom)
 "Py" = (
-/mob/living/simple_animal/bot/secbot/beepsky/armsky{
+/mob/living/basic/bot/secbot/beepsky/armsky{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/mineral/plastitanium,
diff --git a/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm b/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm
index f8c5c6eae43..76e20d9fc94 100644
--- a/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm
+++ b/_maps/bubber/automapper/templates/wawastation/wawastation_kiosk.dmm
@@ -4,7 +4,7 @@
 /area/template_noop)
 "b" = (
 /turf/closed/mineral/random/stationside/asteroid/porus{
-	mineralChance = 20
+	mineral_chance = 20
 	},
 /area/station/commons/kiosk)
 "c" = (
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index f81a6cd0645..102c43c5571 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -20996,7 +20996,7 @@
 	codes_txt = "patrol;next_patrol=1-1";
 	location = "1-0"
 	},
-/mob/living/simple_animal/bot/secbot/beepsky/officer{
+/mob/living/basic/bot/secbot/beepsky/officer{
 	name = "Beepsky the First"
 	},
 /turf/open/floor/iron/dark,
@@ -31231,7 +31231,7 @@
 	codes_txt = "patrol;next_patrol=3-8";
 	location = "3-7"
 	},
-/mob/living/simple_animal/bot/secbot/beepsky/officer{
+/mob/living/basic/bot/secbot/beepsky/officer{
 	name = "Beepsky the Third"
 	},
 /turf/open/floor/iron,
@@ -43644,7 +43644,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /turf/open/floor/iron/dark,
 /area/station/security/armory)
 "kTI" = (
@@ -79263,7 +79263,7 @@
 	codes_txt = "patrol;next_patrol=2-11";
 	location = "2-10"
 	},
-/mob/living/simple_animal/bot/secbot/beepsky/officer{
+/mob/living/basic/bot/secbot/beepsky/officer{
 	name = "Beepsky the Second"
 	},
 /turf/open/floor/iron/dark,
@@ -85868,7 +85868,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/mob/living/simple_animal/bot/secbot/pingsky,
+/mob/living/basic/bot/secbot/pingsky,
 /turf/open/floor/circuit,
 /area/station/ai/satellite/interior)
 "vrw" = (
diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm
index 991493584b4..c5c20188154 100644
--- a/_maps/map_files/Ouroboros/Ouroboros.dmm
+++ b/_maps/map_files/Ouroboros/Ouroboros.dmm
@@ -38844,7 +38844,7 @@
 	c_tag = "MiniSat Antechamber";
 	network = list("minisat")
 	},
-/mob/living/simple_animal/bot/secbot/pingsky,
+/mob/living/basic/bot/secbot/pingsky,
 /turf/open/floor/wood/large,
 /area/station/tcommsat/computer)
 "lgd" = (
@@ -80565,7 +80565,7 @@
 /turf/open/floor/engine/co2,
 /area/station/engineering/atmos/upper)
 "xis" = (
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark/diagonal,
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 4bc860915cb..23084c089c0 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -56964,7 +56964,7 @@
 /turf/open/floor/pod/dark,
 /area/station/service/chapel)
 "pVK" = (
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /obj/effect/landmark/event_spawn,
 /obj/machinery/holopad/secure,
 /obj/effect/turf_decal/bot,
@@ -72301,7 +72301,7 @@
 /area/station/hallway/secondary/command)
 "ueg" = (
 /obj/machinery/airalarm/directional/south,
-/mob/living/simple_animal/bot/secbot/pingsky,
+/mob/living/basic/bot/secbot/pingsky,
 /obj/structure/railing{
 	dir = 4
 	},
@@ -76661,7 +76661,7 @@
 /turf/closed/wall/r_wall,
 /area/station/medical/virology)
 "vnv" = (
-/mob/living/simple_animal/bot/secbot/beepsky/officer,
+/mob/living/basic/bot/secbot/beepsky/officer,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/security/office)
 "vnO" = (
diff --git a/_maps/shuttles/zubbers/emergency_vortex.dmm b/_maps/shuttles/zubbers/emergency_vortex.dmm
index 8d77ecdc71c..bf5c3e0510e 100644
--- a/_maps/shuttles/zubbers/emergency_vortex.dmm
+++ b/_maps/shuttles/zubbers/emergency_vortex.dmm
@@ -156,7 +156,7 @@
 /obj/machinery/holopad/secure,
 /obj/effect/turf_decal/bot,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/simple_animal/bot/secbot/beepsky/officer{
+/mob/living/basic/bot/secbot/beepsky/officer{
 	name = "Officer Olesky";
 	desc = "It's Officer Olesky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too.";
 	bot_mode_flags = 1.67772e+007
diff --git a/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
index 23794efa51d..fb861eec5a6 100644
--- a/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
+++ b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
@@ -184,7 +184,7 @@
 	dir = 4
 	},
 /obj/structure/cable,
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
index caabbef7135..f40e7f2f871 100644
--- a/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
+++ b/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
@@ -216,7 +216,7 @@
 /area/station/security/armory)
 "L" = (
 /obj/effect/turf_decal/bot,
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /turf/open/floor/iron/dark,
 /area/station/security/armory)
 "M" = (
diff --git a/bubber_archive/Limastation/LimaStation.dmm b/bubber_archive/Limastation/LimaStation.dmm
index cda6eb23eb4..f86a0e22e8d 100644
--- a/bubber_archive/Limastation/LimaStation.dmm
+++ b/bubber_archive/Limastation/LimaStation.dmm
@@ -12035,7 +12035,7 @@
 /turf/open/floor/carpet/royalblue,
 /area/station/command/heads_quarters/hop)
 "eOt" = (
-/mob/living/simple_animal/bot/secbot/pingsky,
+/mob/living/basic/bot/secbot/pingsky,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
@@ -48082,7 +48082,7 @@
 "rWM" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/ai_monitored/security/armory)
 "rWU" = (