mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-05 14:32:52 +00:00
Converts Spaceman mobs from simple to basic (#75944)
## About The Pull Request This changes the Spaceman simplemobs into basic mobs. They really didn't do anything besides stand around and retaliate, so no new AI datums had to be added. ## Why It's Good For The Game Scratch it from da list. ## Changelog 🆑 code: Spaceman simple mobs have been converted to basic mobs. /🆑 --------- Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
@@ -45,7 +45,7 @@
|
||||
/turf/template_noop,
|
||||
/area/ruin/space/has_grav/powered)
|
||||
"k" = (
|
||||
/mob/living/simple_animal/hostile/retaliate/spaceman,
|
||||
/mob/living/basic/spaceman,
|
||||
/turf/open/floor/oldshuttle,
|
||||
/area/ruin/space/has_grav/powered)
|
||||
"l" = (
|
||||
@@ -70,7 +70,7 @@
|
||||
/obj/structure/chair/old{
|
||||
dir = 1
|
||||
},
|
||||
/mob/living/simple_animal/hostile/retaliate/spaceman,
|
||||
/mob/living/basic/spaceman,
|
||||
/turf/open/floor/oldshuttle,
|
||||
/area/ruin/space/has_grav/powered)
|
||||
"t" = (
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/mob/living/simple_animal/hostile/retaliate/spaceman
|
||||
/mob/living/basic/spaceman
|
||||
name = "Spaceman"
|
||||
desc = "What in the actual hell..?"
|
||||
icon = 'icons/mob/simple/animal.dmi'
|
||||
icon_state = "old"
|
||||
icon_living = "old"
|
||||
icon_dead = "old_dead"
|
||||
@@ -8,7 +9,6 @@
|
||||
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
|
||||
sentience_type = SENTIENCE_HUMANOID
|
||||
gender = MALE
|
||||
turns_per_move = 5
|
||||
response_disarm_continuous = "gently pushes aside"
|
||||
response_disarm_simple = "gently push aside"
|
||||
response_harm_continuous = "punches"
|
||||
@@ -17,7 +17,6 @@
|
||||
maxHealth = 100
|
||||
health = 100
|
||||
speed = 0
|
||||
harm_intent_damage = 8
|
||||
melee_damage_lower = 10
|
||||
melee_damage_upper = 10
|
||||
attack_verb_continuous = "hits"
|
||||
@@ -25,5 +24,21 @@
|
||||
attack_sound = 'sound/weapons/punch1.ogg'
|
||||
obj_damage = 0
|
||||
environment_smash = ENVIRONMENT_SMASH_NONE
|
||||
del_on_death = 0
|
||||
footstep_type = FOOTSTEP_MOB_SHOE
|
||||
ai_controller = /datum/ai_controller/basic_controller/spaceman
|
||||
|
||||
/mob/living/basic/spaceman/Initialize(mapload)
|
||||
. = ..()
|
||||
AddElement(/datum/element/ai_retaliate)
|
||||
|
||||
/datum/ai_controller/basic_controller/spaceman
|
||||
blackboard = list(
|
||||
BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/ignore_faction,
|
||||
)
|
||||
|
||||
ai_movement = /datum/ai_movement/basic_avoidance
|
||||
idle_behavior = /datum/idle_behavior/idle_random_walk
|
||||
|
||||
planning_subtrees = list(
|
||||
/datum/ai_planning_subtree/target_retaliate,
|
||||
/datum/ai_planning_subtree/basic_melee_attack_subtree,
|
||||
)
|
||||
@@ -246,7 +246,6 @@
|
||||
/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace,
|
||||
/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/ranged,
|
||||
/mob/living/simple_animal/hostile/retaliate/snake,
|
||||
/mob/living/simple_animal/hostile/retaliate/spaceman,
|
||||
/mob/living/simple_animal/hostile/retaliate/trader,
|
||||
/mob/living/simple_animal/hostile/retaliate/trader/mrbones,
|
||||
/mob/living/simple_animal/hostile/skeleton,
|
||||
|
||||
@@ -3977,6 +3977,7 @@
|
||||
#include "code\modules\mob\living\basic\space_fauna\headslug.dm"
|
||||
#include "code\modules\mob\living\basic\space_fauna\killer_tomato.dm"
|
||||
#include "code\modules\mob\living\basic\space_fauna\lightgeist.dm"
|
||||
#include "code\modules\mob\living\basic\space_fauna\spaceman.dm"
|
||||
#include "code\modules\mob\living\basic\space_fauna\carp\carp.dm"
|
||||
#include "code\modules\mob\living\basic\space_fauna\carp\carp_abilities.dm"
|
||||
#include "code\modules\mob\living\basic\space_fauna\carp\carp_ai_actions.dm"
|
||||
@@ -4286,7 +4287,6 @@
|
||||
#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"
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
# modifies simple_animal spacemans into the new basic mob type
|
||||
|
||||
/mob/living/simple_animal/hostile/retaliate/spaceman : /mob/living/basic/spaceman{@OLD}
|
||||
Reference in New Issue
Block a user