Merge branch 'master' into KineticMachete+

Monkestation · Sep 9, 2023 · fe29b79 · fe29b79
2 parents a37b18a + c28b6e4
commit fe29b79
Show file tree

Hide file tree

Showing 906 changed files with 41,932 additions and 18,406 deletions.
diff --git a/.gitignore b/.gitignore
@@ -233,3 +233,6 @@ Tracy.exe
 
 # From /tools/define_sanity/check.py - potential output file that we load onto the user's machine that we don't want to have committed.
 define_sanity_output.txt
+
+#This file contains developer-specific config overrides. These shouldn't be committed.
+config/_config_nogit.txt
diff --git a/_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm b/_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm
@@ -21,7 +21,7 @@
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)
 "g" = (
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)
 "h" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
@@ -29,7 +29,7 @@
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "cK" = (
-/mob/living/simple_animal/hostile/ant{
+/mob/living/basic/ant{
 	environment_smash = 0
 	},
 /turf/open/floor/grass,
@@ -178,7 +178,7 @@
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "uB" = (
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /obj/structure/chair/pew/left{
 	dir = 8
 	},
@@ -205,7 +205,7 @@
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "xq" = (
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /obj/effect/turf_decal/siding/wideplating/light{
 	color = "#236F26"
 	},
@@ -322,7 +322,7 @@
 /obj/item/stack/ducts/fifty{
 	amount = 23
 	},
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "Nv" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
@@ -178,7 +178,7 @@
 	},
 /area/ruin/unpowered/buried_library)
 "aO" = (
-/mob/living/simple_animal/pet/fox,
+/mob/living/basic/pet/fox,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -298,7 +298,7 @@
 /area/ruin/unpowered/buried_library)
 "bh" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/pet/fox,
+/mob/living/basic/pet/fox,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -384,7 +384,8 @@
 /obj/structure/fluff/paper{
 	dir = 1
 	},
-/mob/living/simple_animal/pet/fox,
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/pet/fox,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -224,7 +224,7 @@
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "fS" = (
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "Jonny"
 	},
 /turf/open/misc/beach/sand,
@@ -560,7 +560,7 @@
 /turf/closed/wall/mineral/wood/nonmetal,
 /area/ruin/powered/beach)
 "sA" = (
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "Jon"
 	},
 /turf/open/misc/beach/sand,
@@ -761,7 +761,7 @@
 /area/ruin/powered/beach)
 "AB" = (
 /obj/effect/turf_decal/sand,
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "James"
 	},
 /turf/open/misc/beach/sand,
@@ -1270,7 +1270,7 @@
 /area/ruin/powered/beach)
 "SC" = (
 /obj/machinery/light/directional/north,
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "Eddie"
 	},
 /turf/open/misc/beach/sand,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm
@@ -36,9 +36,7 @@
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "j" = (
-/mob/living/simple_animal/butterfly{
-	atmos_requirements = list()
-	},
+/mob/living/basic/butterfly/lavaland,
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "l" = (
@@ -54,8 +52,7 @@
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "p" = (
-/mob/living/simple_animal/hostile/lightgeist{
-	AIStatus = 1;
+/mob/living/basic/lightgeist{
 	light_color = "#42ECFF"
 	},
 /turf/open/misc/grass/lavaland,
@@ -67,9 +64,7 @@
 "r" = (
 /obj/structure/flora/grass/jungle/b/style_random,
 /obj/structure/flora/bush/sparsegrass/style_random,
-/mob/living/simple_animal/butterfly{
-	atmos_requirements = list()
-	},
+/mob/living/basic/butterfly/lavaland,
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "s" = (
@@ -93,8 +88,7 @@
 /area/ruin/unpowered/gaia)
 "B" = (
 /obj/structure/flora/grass/jungle/a/style_random,
-/mob/living/simple_animal/hostile/lightgeist{
-	AIStatus = 1;
+/mob/living/basic/lightgeist{
 	light_color = "#42ECFF"
 	},
 /turf/open/misc/grass/lavaland,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -496,7 +496,7 @@
 /turf/open/floor/carpet/blue/lavaland,
 /area/ruin/unpowered)
 "Fg" = (
-/mob/living/simple_animal/hostile/asteroid/goliath/beast,
+/mob/living/basic/mining/goliath,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)

diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -225,7 +225,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/abandonedzoo)
 "bJ" = (
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	faction = list("carp")
 	},
 /turf/open/floor/plating,
@@ -297,7 +297,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/abandonedzoo)
 "gE" = (
-/mob/living/simple_animal/hostile/bee,
+/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "ib" = (
@@ -358,7 +358,7 @@
 /area/ruin/space/has_grav/abandonedzoo)
 "nY" = (
 /obj/structure/flora/bush/leavy/style_random,
-/mob/living/simple_animal/hostile/bee,
+/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "oS" = (
@@ -384,9 +384,7 @@
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "vU" = (
-/mob/living/simple_animal/hostile/asteroid/goldgrub{
-	will_burrow = 0
-	},
+/mob/living/basic/mining/goldgrub,
 /turf/open/misc/asteroid,
 /area/ruin/space/has_grav/abandonedzoo)
 "wc" = (
@@ -438,12 +436,12 @@
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
 "Mb" = (
-/mob/living/simple_animal/hostile/bee,
-/mob/living/simple_animal/hostile/bee,
-/mob/living/simple_animal/hostile/bee,
-/mob/living/simple_animal/hostile/bee,
-/mob/living/simple_animal/hostile/bee,
-/mob/living/simple_animal/hostile/bee,
+/mob/living/basic/bee,
+/mob/living/basic/bee,
+/mob/living/basic/bee,
+/mob/living/basic/bee,
+/mob/living/basic/bee,
+/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "Ng" = (
@@ -465,8 +463,8 @@
 /area/ruin/space/has_grav/abandonedzoo)
 "PF" = (
 /obj/machinery/light/directional/south,
-/mob/living/simple_animal/hostile/bee,
-/mob/living/simple_animal/hostile/bee,
+/mob/living/basic/bee,
+/mob/living/basic/bee,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav/abandonedzoo)
 "Rh" = (
@@ -501,7 +499,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/abandonedzoo)
 "WV" = (
-/mob/living/simple_animal/hostile/asteroid/basilisk,
+/mob/living/basic/mining/basilisk,
 /turf/open/misc/asteroid,
 /area/ruin/space/has_grav/abandonedzoo)
 "Xx" = (

diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -275,7 +275,7 @@
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "ET" = (
-/mob/living/simple_animal/hostile/lizard,
+/mob/living/basic/lizard,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "Fo" = (

diff --git a/_maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm b/_maps/RandomRuins/SpaceRuins/cyborg_mothership.dmm
@@ -50,7 +50,7 @@
 /turf/open/misc/asteroid/airless,
 /area/space)
 "o" = (
-/mob/living/simple_animal/hostile/hivebot/range,
+/mob/living/basic/hivebot/range,
 /turf/open/misc/asteroid/airless,
 /area/space)
 "p" = (
@@ -91,15 +91,15 @@
 /turf/open/misc/asteroid/airless,
 /area/space)
 "D" = (
-/mob/living/simple_animal/hostile/hivebot,
+/mob/living/basic/hivebot,
 /turf/open/misc/asteroid/airless,
 /area/space)
 "E" = (
 /obj/structure/spacevine,
 /turf/open/misc/asteroid/airless,
 /area/space)
 "F" = (
-/mob/living/simple_animal/hostile/hivebot/mechanic,
+/mob/living/basic/hivebot/mechanic,
 /turf/open/misc/asteroid/airless,
 /area/space)
 "G" = (
@@ -140,7 +140,7 @@
 /turf/open/misc/asteroid/airless,
 /area/space)
 "Q" = (
-/mob/living/simple_animal/hostile/hivebot/strong,
+/mob/living/basic/hivebot/strong,
 /turf/open/misc/asteroid/airless,
 /area/space)
 "R" = (
@@ -171,7 +171,7 @@
 /turf/open/misc/asteroid/airless,
 /area/space)
 "Y" = (
-/mob/living/simple_animal/hostile/hivebot/range,
+/mob/living/basic/hivebot/range,
 /obj/effect/decal/cleanable/oil/streak,
 /turf/open/misc/asteroid/airless,
 /area/space)

diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -410,7 +410,7 @@
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/powered/cat_man)
 "bs" = (
-/mob/living/simple_animal/hostile/cat_butcherer,
+/mob/living/basic/cat_butcherer,
 /turf/open/floor/iron/white/side{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm
@@ -740,7 +740,7 @@
 /turf/open/indestructible/paper,
 /area/ruin/space/has_grav/powered)
 "cc" = (
-/mob/living/simple_animal/hostile/boss/paper_wizard,
+/mob/living/basic/paper_wizard,
 /turf/open/indestructible/paper,
 /area/ruin/space/has_grav/powered)
 "cd" = (