Fix mob types for tts

ss220-space · Dec 5, 2023 · 4be1adb · 4be1adb
1 parent e9301b3
commit 4be1adb
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/modular_ss220/modules/translations/code/customer_ru.dm b/modular_ss220/modules/translations/code/customer_ru.dm
@@ -179,7 +179,7 @@
 	return "Я буду [translation[picked_serving]] [initial(reagent_type.name)]"
 
 
-/mob/living/simple_animal/robot_customer/Initialize(mapload, datum/customer_data/customer_data, datum/venue/attending_venue)
+/mob/living/basic/robot_customer/Initialize(mapload, datum/customer_data/customer_data, datum/venue/attending_venue)
 	. = ..()
 	var/datum/customer_data/customer_info = SSrestaurant.all_customers[customer_data]
 	if(customer_info)

diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/friendly.dm b/modular_ss220/modules/tts/code/base_seeds/mobs/friendly.dm
@@ -1,6 +1,6 @@
 //Farm and friendly creatures.
 
-/mob/living/simple_animal/parrot
+/mob/living/basic/parrot
 	tts_seed = "Sniper"
 
 /mob/living/simple_animal/pet/cat
@@ -9,22 +9,22 @@
 /mob/living/basic/cockroach
 	tts_seed = "Villagerm"
 
-/mob/living/simple_animal/crab
+/mob/living/basic/crab
 	tts_seed = "Riki"
 
 /mob/living/basic/pet/dog
 	tts_seed = "Stetmann"
 
-/mob/living/simple_animal/hostile/retaliate/goat
+/mob/living/basic/goat
 	tts_seed = "Muradin"
 
 /mob/living/basic/cow
 	tts_seed = "Cairne"
 
-/mob/living/simple_animal/chick
+/mob/living/basic/chick
 	tts_seed = "Meepo"
 
-/mob/living/simple_animal/chicken
+/mob/living/basic/chicken
 	tts_seed = "Windranger"
 
 /mob/living/basic/pig
@@ -33,13 +33,13 @@
 /mob/living/simple_animal/hostile/retaliate/goose
 	tts_seed = "pantheon"
 
-/mob/living/simple_animal/pet/fox
+/mob/living/basic/pet/fox
 	tts_seed = "Barney"
 
 /mob/living/basic/frog
 	tts_seed = "pantheon"
 
-/mob/living/simple_animal/hostile/lizard
+/mob/living/basic/lizard
 	tts_seed = "Shaker"
 
 /mob/living/basic/mouse
@@ -51,11 +51,11 @@
 /mob/living/basic/mouse/brown
 	tts_seed = "Clockwerk"
 
-/mob/living/simple_animal/pet/penguin
+/mob/living/basic/pet/penguin
 	tts_seed = "Narrator"
 
-/mob/living/simple_animal/sloth
+/mob/living/basic/sloth
 	tts_seed = "Peon"
 
-/mob/living/simple_animal/butterfly
+/mob/living/basic/butterfly
 	tts_seed = "Meepo"
diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/guardian.dm b/modular_ss220/modules/tts/code/base_seeds/mobs/guardian.dm
@@ -1,16 +1,16 @@
 //Guardians
 
-/mob/living/simple_animal/hostile/guardian
+/mob/living/basic/guardian
 	tts_seed = "Earth"
 
-/mob/living/simple_animal/hostile/guardian/assassin
+/mob/living/basic/guardian/assassin
 	tts_seed = "Spy"
 
-/mob/living/simple_animal/hostile/guardian/lightning
+/mob/living/basic/guardian/lightning
 	tts_seed = "Archmage"
 
-/mob/living/simple_animal/hostile/guardian/protector
+/mob/living/basic/guardian/protector
 	tts_seed = "Caime"
 
-/mob/living/simple_animal/hostile/guardian/standard
+/mob/living/basic/guardian/standard
 	tts_seed = "Heavy"
diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/hostile.dm b/modular_ss220/modules/tts/code/base_seeds/mobs/hostile.dm
@@ -1,6 +1,6 @@
 //Hostile mobs
 
-/mob/living/simple_animal/hostile/blob
+/mob/living/basic/blob_minion
 	tts_seed = "Earth"
 
 /mob/living/basic/clockwork_marauder
@@ -9,25 +9,25 @@
 /mob/living/basic/cortical_borer
 	tts_seed = "Gman_e2"
 
-/mob/living/simple_animal/hostile/morph
+/mob/living/basic/morph
 	tts_seed = "Treant"
 
-/mob/living/simple_animal/revenant
+/mob/living/basic/revenant
 	tts_seed = "Sylvanas"
 
-/mob/living/simple_animal/hostile/imp/slaughter
+/mob/living/basic/demon
 	tts_seed = "Mannoroth"
 
-/mob/living/simple_animal/hostile/construct
+/mob/living/basic/construct
 	tts_seed = "Acolyte"
 
-/mob/living/simple_animal/hostile/construct/wraith
+/mob/living/basic/construct/wraith
 	tts_seed = "Kelthuzad"
 
-/mob/living/simple_animal/hostile/retaliate/snake
+/mob/living/basic/snake
 	tts_seed = "Ladyvashj"
 
-/mob/living/simple_animal/hostile/bear
+/mob/living/basic/bear
 	tts_seed = "Shaker"
 
 /mob/living/basic/carp

diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/lavaland.dm b/modular_ss220/modules/tts/code/base_seeds/mobs/lavaland.dm
@@ -6,22 +6,22 @@
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner
 	tts_seed = "Chen"
 
-/mob/living/simple_animal/hostile/asteroid/basilisk
+/mob/living/basic/mining/basilisk
 	tts_seed = "Antimage"
 
-/mob/living/simple_animal/hostile/asteroid/goliath
+/mob/living/basic/mining/goliath
 	tts_seed = "Bloodseeker"
 
-/mob/living/simple_animal/hostile/asteroid/hivelord
+/mob/living/basic/mining/hivelord
 	tts_seed = "Ladyvashj"
 
-/mob/living/simple_animal/hostile/asteroid/hivelordbrood
+/mob/living/basic/legion_brood
 	tts_seed = "Ladyvashj"
 
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion
+/mob/living/basic/mining/legion
 	tts_seed = "Bloodseeker"
 
-/mob/living/simple_animal/hostile/big_legion
+/mob/living/basic/mining/legion/big
 	tts_seed = "Mannoroth"
 
 /mob/living/simple_animal/hostile/asteroid/elite/broodmother

diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/other.dm b/modular_ss220/modules/tts/code/base_seeds/mobs/other.dm
@@ -6,7 +6,7 @@
 /obj/item/nullrod/scythe/talking
 	tts_seed = "Sylvanas"
 
-/mob/living/simple_animal/shade
+/mob/living/basic/shade
 	tts_seed = "Kelthuzad"
 
 /mob/living/simple_animal/bot

diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/pets.dm b/modular_ss220/modules/tts/code/base_seeds/mobs/pets.dm
@@ -3,5 +3,5 @@
 /mob/living/basic/giant_spider/sgt_araneus
 	tts_seed = "Anubarak"
 
-/mob/living/simple_animal/parrot/poly
+/mob/living/basic/parrot/poly
 	tts_seed = "Gyro"