diff --git a/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm b/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm new file mode 100644 index 0000000000..9af6e67f1f --- /dev/null +++ b/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm @@ -0,0 +1,5 @@ +/datum/ai_holder/simple_mob/melee/evasive/returnhome + returns_home = 1 + +/datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome + returns_home = 1 \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm new file mode 100644 index 0000000000..026c803e4b --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm @@ -0,0 +1,3 @@ +/datum/say_list/merc/unknown_ind + speak = list("One day the'll fix that damn engine..","Next time, We're hidding on the tropical beach planet.","Wish I had better equipment...","I knew I should have been a line chef...","Fuckin' helmet keeps fogging up.","Hate this blocky ass ship.") + say_got_target = list("Looks like trouble!","Contact!","We've got company!","Perimeter Breached!!") \ No newline at end of file diff --git a/maps/submaps/surface_submaps/plains/Oldhouse.dmm b/maps/submaps/surface_submaps/plains/Oldhouse.dmm index 2c5d7537a7..3047b95ab3 100644 --- a/maps/submaps/surface_submaps/plains/Oldhouse.dmm +++ b/maps/submaps/surface_submaps/plains/Oldhouse.dmm @@ -37,7 +37,7 @@ "K" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/submap/Oldhouse) "L" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse) "M" = (/obj/structure/frame,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"N" = (/mob/living/simple_mob/animal/giant_spider{attack_armor_pen = 100; attacktext = list("lightly bonked"); desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; faction = "neutral"; health = 400; melee_damage_lower = 1; melee_damage_upper = 3; melee_miss_chance = 30; move_speed = 5; name = "Mr. Tuddly"},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) +"N" = (/mob/living/simple_mob/animal/giant_spider{attack_armor_pen = 100; attacktext = list("lightly bonked"); desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; faction = "neutral"; health = 400; melee_damage_lower = 1; melee_damage_upper = 3; melee_miss_chance = 30; movement_cooldown = 8; name = "Mr. Tuddly"},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "O" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "P" = (/obj/item/weapon/circuitboard/papershredder,/turf/simulated/floor/wood,/area/submap/Oldhouse) "Q" = (/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) diff --git a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm index 4b748edaf6..07b8686996 100644 --- a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm @@ -179,7 +179,7 @@ /turf/simulated/floor/wood, /area/submap/Oldhouse) "aN" = ( -/mob/living/simple_animal/hostile/giant_spider{ +/mob/living/simple_mob/animal/giant_spider{ attack_armor_pen = 100; attacktext = list("lightly bonked"); desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; @@ -188,7 +188,7 @@ melee_damage_lower = 1; melee_damage_upper = 3; melee_miss_chance = 30; - move_speed = 5; + movement_cooldown = 8; name = "Mr. Tuddly" }, /turf/simulated/floor/carpet/turcarpet, diff --git a/maps/submaps/surface_submaps/plains/RationCache_vr.dmm b/maps/submaps/surface_submaps/plains/RationCache_vr.dmm index 1437cbdcc1..c11cc2d79f 100644 --- a/maps/submaps/surface_submaps/plains/RationCache_vr.dmm +++ b/maps/submaps/surface_submaps/plains/RationCache_vr.dmm @@ -6,7 +6,7 @@ /turf/simulated/floor/outdoors/snow, /area/submap/RationCache) "c" = ( -/mob/living/simple_animal/otie/feral, +/mob/living/simple_mob/vore/aggressive/dino, /turf/simulated/floor/outdoors/snow, /area/submap/RationCache) "d" = ( diff --git a/maps/submaps/surface_submaps/plains/Shakden_vr.dmm b/maps/submaps/surface_submaps/plains/Shakden_vr.dmm index 61eefb2bff..866f73517d 100644 --- a/maps/submaps/surface_submaps/plains/Shakden_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Shakden_vr.dmm @@ -38,7 +38,7 @@ }, /area/submap/Shakden) "h" = ( -/mob/living/simple_animal/hostile/dragon, +/mob/living/simple_mob/vore/aggressive/dragon/virgo3b, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm index 57796f125e..6c08c071f9 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm @@ -118,7 +118,7 @@ }, /area/submap/Thiefc) "q" = ( -/mob/living/simple_animal/hostile/bear, +/mob/living/simple_mob/animal/space/bear, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, diff --git a/maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm b/maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm index 66a5ae2d54..c1e1da0f46 100644 --- a/maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm +++ b/maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm @@ -148,9 +148,9 @@ }, /area/submap/virgo2/Blackshuttledown) "aB" = ( -/mob/living/simple_mob/hostile/viscerator, -/mob/living/simple_mob/hostile/viscerator, -/mob/living/simple_mob/hostile/viscerator, +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aC" = ( @@ -163,7 +163,7 @@ /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aD" = ( -/mob/living/simple_mob/hostile/syndicate/ranged/space, +/mob/living/simple_mob/humanoid/merc/ranged/space, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aE" = ( @@ -242,11 +242,10 @@ /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aT" = ( -/mob/living/simple_mob/hostile/syndicate/ranged{ - desc = "Dosen't look friendly in the slightest."; +/mob/living/simple_mob/humanoid/merc/ranged{ name = "Unknown Individual"; - say_got_target = list("Looks like trouble!","Contact!","We've got company!","Perimeter Breached!!"); - speak = list("One day the'll fix that damn engine..","Next time, We're hidding on the tropical beach planet.","Wish I had better equipment...","I knew I should have been a line chef...","Fuckin' helmet keeps fogging up.","Hate this blocky ass ship.") + desc = "Dosen't look friendly in the slightest."; + say_list_type = /datum/say_list/merc/unknown_ind }, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) @@ -374,7 +373,7 @@ /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bn" = ( -/mob/living/simple_mob/hostile/viscerator, +/mob/living/simple_mob/mechanical/viscerator, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bo" = ( @@ -393,8 +392,8 @@ /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bq" = ( -/mob/living/simple_mob/hostile/viscerator, -/mob/living/simple_mob/hostile/viscerator, +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "br" = ( @@ -439,7 +438,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/Blackshuttledown) "bz" = ( -/mob/living/simple_mob/hostile/syndicate/ranged/space, +/mob/living/simple_mob/humanoid/merc/ranged/space, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/Blackshuttledown) diff --git a/maps/tether/submaps/aerostat/submaps/Boombase.dmm b/maps/tether/submaps/aerostat/submaps/Boombase.dmm index dd8247263f..d67dd5da09 100644 --- a/maps/tether/submaps/aerostat/submaps/Boombase.dmm +++ b/maps/tether/submaps/aerostat/submaps/Boombase.dmm @@ -57,7 +57,7 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "ao" = ( -/mob/living/simple_mob/hostile/jelly, +/mob/living/simple_mob/animal/space/jelly, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "ap" = ( @@ -96,7 +96,7 @@ /area/submap/virgo2/BoomBase) "ax" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_mob/hostile/jelly, +/mob/living/simple_mob/animal/space/jelly, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "ay" = ( diff --git a/maps/tether/submaps/aerostat/submaps/CaveS.dmm b/maps/tether/submaps/aerostat/submaps/CaveS.dmm index 005a584089..5310ddc86a 100644 --- a/maps/tether/submaps/aerostat/submaps/CaveS.dmm +++ b/maps/tether/submaps/aerostat/submaps/CaveS.dmm @@ -48,7 +48,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) "m" = ( -/mob/living/simple_mob/hostile/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) "n" = ( @@ -61,7 +61,7 @@ /area/submap/virgo2/CaveS) "q" = ( /obj/effect/decal/cleanable/cobweb2, -/mob/living/simple_mob/hostile/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) "r" = ( @@ -133,7 +133,7 @@ /area/submap/virgo2/CaveS) "D" = ( /obj/effect/spider/stickyweb, -/mob/living/simple_mob/hostile/giant_spider/lurker, +/mob/living/simple_mob/animal/giant_spider/lurker, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) "E" = ( diff --git a/maps/tether/submaps/aerostat/submaps/Rockybase.dmm b/maps/tether/submaps/aerostat/submaps/Rockybase.dmm index 95faba534a..b5fc99c31f 100644 --- a/maps/tether/submaps/aerostat/submaps/Rockybase.dmm +++ b/maps/tether/submaps/aerostat/submaps/Rockybase.dmm @@ -1,8 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/mob/living/simple_mob/hostile/viscerator{ +/mob/living/simple_mob/mechanical/viscerator{ maxbodytemp = 900; - returns_home = 1 + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/returnhome }, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/template_noop) @@ -21,11 +21,11 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "af" = ( -/mob/living/simple_mob/hostile/malf_drone{ +/mob/living/simple_mob/mechanical/combat_drone{ desc = "An automated combat drone with an aged apperance."; faction = "syndicate"; maxbodytemp = 900; - returns_home = 1 + ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome }, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/Rockybase) @@ -357,11 +357,11 @@ /turf/simulated/floor/tiled, /area/submap/virgo2/Rockybase) "bl" = ( -/mob/living/simple_mob/hostile/malf_drone{ +/mob/living/simple_mob/mechanical/combat_drone{ desc = "An automated combat drone with an aged apperance."; faction = "syndicate"; maxbodytemp = 900; - returns_home = 1 + ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome }, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) @@ -664,7 +664,7 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "co" = ( -/mob/living/simple_mob/hostile/mecha/malf_drone{ +/mob/living/simple_mob/mechanical/combat_drone{ faction = "syndicate" }, /turf/simulated/floor/tiled/techfloor/virgo2, diff --git a/vorestation.dme b/vorestation.dme index 434b0db6de..402b01c1ac 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1480,6 +1480,7 @@ #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" #include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm" #include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm_handler.dm" @@ -2365,6 +2366,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\combat_drone.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm"