From 67c3ccb3004255ff827b5bfecbf960e1fc56549f Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Sun, 16 Apr 2023 03:43:22 +0000 Subject: [PATCH] Turns space bat into a basic mob & moves retaliate mobs to retaliate folder (#74747) ## About The Pull Request Turns Space Bats into a basic mob, why not. I also noticed some retaliate mobs weren't in the retaliate folder, and moved them over. I didn't move goats over because they're in a large file and didn't want to really expand much on this PR that I just wanted to focus on just bats. ## Why It's Good For The Game I was just messing around with some bat stuff and thought I might as well make them basic mobs. ## Changelog :cl: code: Space Bats are now Basic mobs. /:cl: --- _maps/RandomZLevels/caves.dmm | 150 +++++++++--------- code/_globalvars/phobias.dm | 2 +- code/datums/memory/_memory.dm | 2 +- code/modules/events/ghost_role/sentience.dm | 2 +- code/modules/events/wizard/petsplosion.dm | 2 +- .../bat.dm => basic/vermin/space_bat.dm} | 49 ++++-- code/modules/mob/living/living.dm | 2 +- .../{friendly => hostile}/lizard.dm | 0 .../hostile/{ => retaliate}/goose.dm | 0 .../{friendly => hostile/retaliate}/snake.dm | 0 .../{friendly => hostile/retaliate}/trader.dm | 0 .../unit_tests/simple_animal_freeze.dm | 1 - tgstation.dme | 10 +- tools/UpdatePaths/Scripts/space_bat.txt | 3 + 14 files changed, 121 insertions(+), 102 deletions(-) rename code/modules/mob/living/{simple_animal/hostile/retaliate/bat.dm => basic/vermin/space_bat.dm} (56%) rename code/modules/mob/living/simple_animal/{friendly => hostile}/lizard.dm (100%) rename code/modules/mob/living/simple_animal/hostile/{ => retaliate}/goose.dm (100%) rename code/modules/mob/living/simple_animal/{friendly => hostile/retaliate}/snake.dm (100%) rename code/modules/mob/living/simple_animal/{friendly => hostile/retaliate}/trader.dm (100%) create mode 100644 tools/UpdatePaths/Scripts/space_bat.txt diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 1e4198b1736..e777584ee9b 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -441,11 +441,6 @@ /obj/effect/decal/remains/xeno, /turf/open/floor/plating, /area/awaymission/caves/research) -"cB" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/decal/cleanable/xenoblood, -/turf/open/floor/plating, -/area/awaymission/caves/research) "cC" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable, @@ -480,11 +475,6 @@ /obj/effect/decal/cleanable/xenoblood/xgibs, /turf/open/floor/plating, /area/awaymission/caves/research) -"cO" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/window/left/directional/east, -/turf/open/floor/plating, -/area/awaymission/caves/research) "cP" = ( /obj/machinery/door/airlock/external/ruin, /turf/open/floor/plating, @@ -501,23 +491,10 @@ }, /turf/open/floor/plating, /area/awaymission/caves/research) -"cT" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right" - }, -/turf/open/floor/plating, -/area/awaymission/caves/research) "cV" = ( /obj/effect/decal/cleanable/xenoblood/xgibs, /turf/open/floor/plating, /area/awaymission/caves/research) -"cW" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/plating, -/area/awaymission/caves/research) "cX" = ( /obj/structure/table, /obj/item/melee/baton/security, @@ -705,13 +682,6 @@ "dM" = ( /turf/open/floor/iron, /area/awaymission/caves/northblock) -"dO" = ( -/mob/living/simple_animal/hostile/retaliate/bat{ - desc = "A rare breed of bat which roosts deep in caves."; - name = "Cave Bat" - }, -/turf/open/floor/iron, -/area/awaymission/caves/northblock) "dP" = ( /obj/item/stack/rods, /turf/open/floor/iron, @@ -776,11 +746,6 @@ "ej" = ( /turf/open/floor/plating, /area/awaymission/caves/bmp_asteroid) -"ek" = ( -/obj/structure/window/spawner/directional/west, -/mob/living/simple_animal/hostile/mining_drone, -/turf/open/floor/plating, -/area/awaymission/caves/listeningpost) "el" = ( /obj/structure/closet/secure_closet/personal, /obj/item/gun/energy/laser/captain/scattershot, @@ -807,12 +772,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/plating, /area/awaymission/caves/listeningpost) -"es" = ( -/obj/structure/window/spawner/directional/west, -/obj/structure/window/spawner/directional/south, -/mob/living/simple_animal/hostile/mining_drone, -/turf/open/floor/plating, -/area/awaymission/caves/listeningpost) "et" = ( /obj/effect/decal/cleanable/shreds, /turf/open/floor/plating{ @@ -1248,6 +1207,12 @@ /obj/effect/baseturf_helper/asteroid/basalt, /turf/closed/wall, /area/awaymission/caves/northblock) +"he" = ( +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/south, +/mob/living/simple_animal/hostile/mining_drone, +/turf/open/floor/plating, +/area/awaymission/caves/listeningpost) "hq" = ( /turf/open/misc/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" @@ -1275,6 +1240,11 @@ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, /area/awaymission/caves/bmp_asteroid/level_two) +"ix" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/window/left/directional/east, +/turf/open/floor/plating, +/area/awaymission/caves/research) "jH" = ( /obj/structure/spawner/mining/basilisk, /turf/open/misc/asteroid/basalt{ @@ -1377,6 +1347,15 @@ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, /area/awaymission/caves/bmp_asteroid/level_three) +"pL" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/door/window{ + base_state = "right"; + dir = 4; + icon_state = "right" + }, +/turf/open/floor/plating, +/area/awaymission/caves/research) "qD" = ( /obj/machinery/light/small/directional/north, /turf/open/misc/asteroid/basalt{ @@ -1659,15 +1638,6 @@ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, /area/awaymission/caves/bmp_asteroid/level_two) -"CB" = ( -/mob/living/simple_animal/hostile/retaliate/bat{ - desc = "A rare breed of bat which roosts deep in caves."; - name = "Cave Bat" - }, -/turf/open/misc/asteroid/basalt{ - initial_gas_mix = "n2=23;o2=14;TEMP=2.7" - }, -/area/awaymission/caves/bmp_asteroid/level_two) "Ds" = ( /obj/item/pickaxe/rusted{ pixel_x = 5 @@ -1762,6 +1732,11 @@ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, /area/awaymission/caves/bmp_asteroid/level_three) +"IH" = ( +/obj/structure/window/spawner/directional/west, +/mob/living/simple_animal/hostile/mining_drone, +/turf/open/floor/plating, +/area/awaymission/caves/listeningpost) "IN" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating{ @@ -1786,6 +1761,11 @@ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, /area/awaymission/caves/bmp_asteroid/level_three) +"JP" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/plating, +/area/awaymission/caves/research) "Kq" = ( /obj/structure/sign/departments/exam_room/directional/north, /turf/open/floor/iron, @@ -1877,15 +1857,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/plating, /area/awaymission/caves/research) -"OJ" = ( -/mob/living/simple_animal/hostile/retaliate/bat{ - desc = "A rare breed of bat which roosts deep in caves."; - name = "Cave Bat" - }, -/turf/open/misc/asteroid/basalt{ - initial_gas_mix = "n2=23;o2=14;TEMP=2.7" - }, -/area/awaymission/caves/bmp_asteroid) "OX" = ( /turf/closed/indestructible/oldshuttle{ desc = "Go through."; @@ -1902,12 +1873,30 @@ }, /turf/open/floor/iron, /area/awaymission/caves/listeningpost) +"Qe" = ( +/mob/living/basic/bat{ + desc = "A rare breed of bat which roosts deep in caves."; + name = "Cave Bat" + }, +/turf/open/misc/asteroid/basalt{ + initial_gas_mix = "n2=23;o2=14;TEMP=2.7" + }, +/area/awaymission/caves/bmp_asteroid) "Rm" = ( /obj/effect/decal/remains/human, /turf/open/misc/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" }, /area/awaymission/caves/bmp_asteroid/level_four) +"Rt" = ( +/mob/living/basic/bat{ + desc = "A rare breed of bat which roosts deep in caves."; + name = "Cave Bat" + }, +/turf/open/misc/asteroid/basalt{ + initial_gas_mix = "n2=23;o2=14;TEMP=2.7" + }, +/area/awaymission/caves/bmp_asteroid/level_two) "Ry" = ( /obj/structure/grille, /obj/structure/barricade/wooden, @@ -1964,6 +1953,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/awaymission/caves/bmp_asteroid) +"Wx" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating, +/area/awaymission/caves/research) "WB" = ( /obj/structure/table, /obj/item/storage/medkit/toxin, @@ -1971,6 +1964,13 @@ /obj/item/reagent_containers/blood/o_plus, /turf/open/floor/iron, /area/awaymission/caves/bmp_asteroid) +"Xa" = ( +/mob/living/basic/bat{ + desc = "A rare breed of bat which roosts deep in caves."; + name = "Cave Bat" + }, +/turf/open/floor/iron, +/area/awaymission/caves/northblock) "Xs" = ( /mob/living/basic/giant_spider/hunter, /turf/open/misc/asteroid/basalt{ @@ -6324,7 +6324,7 @@ du dA bn dI -dO +Xa dP dI pc @@ -9652,11 +9652,11 @@ bL bL ch cs -cB +JP cN cS -cW -cB +Wx +JP cg bL bL @@ -9910,8 +9910,8 @@ cg cg ct cC -cO -cT +ix +pL cX db cg @@ -12218,7 +12218,7 @@ bL bL BK BK -OJ +Qe BK BK BK @@ -12228,7 +12228,7 @@ cx BK BK BK -OJ +Qe BK BK bL @@ -12752,8 +12752,8 @@ BK BK bL eF -ek -es +IH +he ew eC eF @@ -13245,7 +13245,7 @@ bL bL bL BK -OJ +Qe BK BK BK @@ -13510,7 +13510,7 @@ cx cx BK BK -OJ +Qe BK BK BK @@ -55929,7 +55929,7 @@ oI oI oI oI -CB +Rt oI oI oI @@ -64415,7 +64415,7 @@ bK oI oI oI -CB +Rt oI oI oI @@ -64652,7 +64652,7 @@ bK oI oI oI -CB +Rt oI oI oI @@ -65177,7 +65177,7 @@ oI oI oI hT -CB +Rt oI bK bK diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 20ad6c1b70b..390e92f5f04 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(phobia_mobs, list( /mob/living/basic/faithless, /mob/living/simple_animal/hostile/heretic_summon, /mob/living/simple_animal/hostile/imp, - /mob/living/simple_animal/hostile/retaliate/bat, + /mob/living/basic/bat, /mob/living/basic/ghost, /mob/living/simple_animal/hostile/skeleton, /mob/living/simple_animal/hostile/wizard, diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm index 98dbea10170..fddabc4521c 100644 --- a/code/datums/memory/_memory.dm +++ b/code/datums/memory/_memory.dm @@ -257,7 +257,7 @@ /mob/living/simple_animal/hostile/megafauna/dragon/lesser, /mob/living/simple_animal/hostile/morph, /mob/living/simple_animal/hostile/mushroom, - /mob/living/simple_animal/hostile/retaliate/bat, + /mob/living/basic/bat, /mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/parrot, /mob/living/simple_animal/pet/cat, diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm index 6c1035d29af..058d328fdd7 100644 --- a/code/modules/events/ghost_role/sentience.dm +++ b/code/modules/events/ghost_role/sentience.dm @@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( /mob/living/simple_animal/sloth, /mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/chicken, - /mob/living/simple_animal/hostile/retaliate/bat, + /mob/living/basic/bat, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/hostile/retaliate/snake, /mob/living/simple_animal/hostile/retaliate/goose/vomit, diff --git a/code/modules/events/wizard/petsplosion.dm b/code/modules/events/wizard/petsplosion.dm index 89a74adaea7..915093dae38 100644 --- a/code/modules/events/wizard/petsplosion.dm +++ b/code/modules/events/wizard/petsplosion.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(petsplosion_candidates, typecacheof(list( /mob/living/simple_animal/sloth, /mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/chicken, - /mob/living/simple_animal/hostile/retaliate/bat, + /mob/living/basic/bat, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/hostile/retaliate/snake, /mob/living/simple_animal/hostile/retaliate/goose/vomit, diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/basic/vermin/space_bat.dm similarity index 56% rename from code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm rename to code/modules/mob/living/basic/vermin/space_bat.dm index 8928ef18ceb..6fa1fd7aed5 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm +++ b/code/modules/mob/living/basic/vermin/space_bat.dm @@ -1,38 +1,55 @@ -/mob/living/simple_animal/hostile/retaliate/bat +/mob/living/basic/bat name = "Space Bat" desc = "A rare breed of bat which roosts in spaceships, probably not vampiric." icon_state = "bat" icon_living = "bat" icon_dead = "bat_dead" icon_gib = "bat_dead" - turns_per_move = 1 + + maxHealth = 15 + health = 15 + melee_damage_lower = 5 + melee_damage_upper = 6 + response_help_continuous = "brushes aside" response_help_simple = "brush aside" response_disarm_continuous = "flails at" response_disarm_simple = "flail at" - mob_biotypes = MOB_ORGANIC|MOB_BEAST - speak_chance = 0 - maxHealth = 15 - health = 15 - harm_intent_damage = 6 - melee_damage_lower = 5 - melee_damage_upper = 6 attack_verb_continuous = "bites" attack_verb_simple = "bite" + verb_say = "squeaks" + + faction = list(FACTION_HOSTILE) + mob_biotypes = MOB_ORGANIC|MOB_BEAST butcher_results = list(/obj/item/food/meat/slab = 1) pass_flags = PASSTABLE - faction = list(FACTION_HOSTILE) + attack_sound = 'sound/weapons/bite.ogg' attack_vis_effect = ATTACK_EFFECT_BITE - obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE mob_size = MOB_SIZE_TINY - speak_emote = list("squeaks") - //Space bats need no air to fly in. - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 0 + obj_damage = 0 + unsuitable_atmos_damage = 0 -/mob/living/simple_animal/hostile/retaliate/bat/Initialize(mapload) + ai_controller = /datum/ai_controller/basic_controller/space_bat + +/mob/living/basic/bat/Initialize(mapload) . = ..() AddElement(/datum/element/simple_flying) + AddElement(/datum/element/ai_retaliate) add_traits(list(TRAIT_SPACEWALK, TRAIT_VENTCRAWLER_ALWAYS), INNATE_TRAIT) + +///Controller for space bats, has nothing unique, just retaliation. +/datum/ai_controller/basic_controller/space_bat + blackboard = list( + BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/ignore_faction(), + ) + + ai_traits = STOP_MOVING_WHEN_PULLED + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking + + planning_subtrees = list( + /datum/ai_planning_subtree/target_retaliate, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + ) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 99add144eb3..5cc418171f7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1377,7 +1377,7 @@ /mob/living/simple_animal/hostile/bear, /mob/living/simple_animal/hostile/mushroom, /mob/living/basic/statue, - /mob/living/simple_animal/hostile/retaliate/bat, + /mob/living/basic/bat, /mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/hostile/killertomato, /mob/living/basic/giant_spider, diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/hostile/lizard.dm similarity index 100% rename from code/modules/mob/living/simple_animal/friendly/lizard.dm rename to code/modules/mob/living/simple_animal/hostile/lizard.dm diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/goose.dm similarity index 100% rename from code/modules/mob/living/simple_animal/hostile/goose.dm rename to code/modules/mob/living/simple_animal/hostile/retaliate/goose.dm diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/snake.dm similarity index 100% rename from code/modules/mob/living/simple_animal/friendly/snake.dm rename to code/modules/mob/living/simple_animal/hostile/retaliate/snake.dm diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/trader.dm similarity index 100% rename from code/modules/mob/living/simple_animal/friendly/trader.dm rename to code/modules/mob/living/simple_animal/hostile/retaliate/trader.dm diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 4fefba1d285..afb8a9dcb70 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -240,7 +240,6 @@ /mob/living/simple_animal/hostile/regalrat, /mob/living/simple_animal/hostile/regalrat/controlled, /mob/living/simple_animal/hostile/retaliate, - /mob/living/simple_animal/hostile/retaliate/bat, /mob/living/simple_animal/hostile/retaliate/clown, /mob/living/simple_animal/hostile/retaliate/clown/banana, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk, diff --git a/tgstation.dme b/tgstation.dme index d1927f96d3f..423e02aebc7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3918,6 +3918,7 @@ #include "code\modules\mob\living\basic\vermin\frog.dm" #include "code\modules\mob\living\basic\vermin\mothroach.dm" #include "code\modules\mob\living\basic\vermin\mouse.dm" +#include "code\modules\mob\living\basic\vermin\space_bat.dm" #include "code\modules\mob\living\brain\brain.dm" #include "code\modules\mob\living\brain\brain_item.dm" #include "code\modules\mob\living\brain\brain_say.dm" @@ -4085,13 +4086,10 @@ #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" #include "code\modules\mob\living\simple_animal\friendly\fox.dm" #include "code\modules\mob\living\simple_animal\friendly\gondola.dm" -#include "code\modules\mob\living\simple_animal\friendly\lizard.dm" #include "code\modules\mob\living\simple_animal\friendly\penguin.dm" #include "code\modules\mob\living\simple_animal\friendly\pet.dm" #include "code\modules\mob\living\simple_animal\friendly\robot_customer.dm" #include "code\modules\mob\living\simple_animal\friendly\sloth.dm" -#include "code\modules\mob\living\simple_animal\friendly\snake.dm" -#include "code\modules\mob\living\simple_animal\friendly\trader.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\drone_say.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\drone_tools.dm" @@ -4124,7 +4122,6 @@ #include "code\modules\mob\living\simple_animal\hostile\cat_butcher.dm" #include "code\modules\mob\living\simple_animal\hostile\dark_wizard.dm" #include "code\modules\mob\living\simple_animal\hostile\eyeballs.dm" -#include "code\modules\mob\living\simple_animal\hostile\goose.dm" #include "code\modules\mob\living\simple_animal\hostile\headcrab.dm" #include "code\modules\mob\living\simple_animal\hostile\heretic_monsters.dm" #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm" @@ -4132,6 +4129,7 @@ #include "code\modules\mob\living\simple_animal\hostile\illusion.dm" #include "code\modules\mob\living\simple_animal\hostile\killertomato.dm" #include "code\modules\mob\living\simple_animal\hostile\lightgeist.dm" +#include "code\modules\mob\living\simple_animal\hostile\lizard.dm" #include "code\modules\mob\living\simple_animal\hostile\mimic.dm" #include "code\modules\mob\living\simple_animal\hostile\morph.dm" #include "code\modules\mob\living\simple_animal\hostile\mushroom.dm" @@ -4192,10 +4190,12 @@ #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\herald.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\legionnaire.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\pandora.dm" -#include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm" +#include "code\modules\mob\living\simple_animal\hostile\retaliate\goose.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm" +#include "code\modules\mob\living\simple_animal\hostile\retaliate\snake.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\spaceman.dm" +#include "code\modules\mob\living\simple_animal\hostile\retaliate\trader.dm" #include "code\modules\mob\living\simple_animal\slime\death.dm" #include "code\modules\mob\living\simple_animal\slime\emote.dm" #include "code\modules\mob\living\simple_animal\slime\life.dm" diff --git a/tools/UpdatePaths/Scripts/space_bat.txt b/tools/UpdatePaths/Scripts/space_bat.txt new file mode 100644 index 00000000000..744eefc296a --- /dev/null +++ b/tools/UpdatePaths/Scripts/space_bat.txt @@ -0,0 +1,3 @@ +# turning space bat simple animals into basic mobs + +/mob/living/simple_animal/hostile/retaliate/bat : /mob/living/basic/bat{@OLD}