cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts space bears, space carp, and space bats to basic mobs (#29775)

Browse Source 
* Bears and bats.

* Carp

* Comments, file locations

* Linters!

* Moved initial emotes for basic mobs to a component

* Linters

* Adjusted emote chance for space bats

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Updatepaths

* Apply code review suggestions

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
PollardTheDragon
2025-07-26 05:53:00 +00:00
committed by GitHub
co-authored by Contrabang
parent 99d2f550b9
commit b33f74594a
45 changed files with 228 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/bat.dm → code/modules/mob/living/basic/hostile/bats.dm
+20 -24
View File
@@ -1,4 +1,4 @@
/mob/living/simple_animal/hostile/scarybat
/mob/living/basic/scarybat
name = "space bats"
desc = "A swarm of cute little blood sucking bats that looks pretty pissed."
icon = 'icons/mob/bats.dmi'
@@ -7,63 +7,59 @@
icon_dead = "bat_dead"
icon_gib = "bat_dead"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
butcher_results = list(/obj/item/food/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
speed = 4
maxHealth = 20
health = 20
mob_size = MOB_SIZE_TINY
melee_attack_cooldown_min = 1.5 SECONDS
melee_attack_cooldown_max = 2.5 SECONDS
harm_intent_damage = 8
melee_damage_lower = 10
melee_damage_upper = 10
attacktext = "bites"
environment_smash = ENVIRONMENT_SMASH_STRUCTURES
attack_sound = 'sound/weapons/bite.ogg'
emote_taunt = list("flutters")
taunt_chance = 20
ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile_obstacles
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
// break_stuff_probability = 2
minimum_survivable_temperature = 0
faction = list("scarybat")
gold_core_spawnable = HOSTILE_SPAWN
initial_traits = list(TRAIT_FLYING)
/mob/living/simple_animal/hostile/scarybat/Initialize(mapload, mob/living/L)
/mob/living/basic/scarybat/Initialize(mapload, mob/living/L)
. = ..()
AddComponent(/datum/component/aggro_emote, emote_list = list("flutters"), emote_chance = 20)
if(istype(L))
faction += "\ref[L]"
/mob/living/simple_animal/hostile/scarybat/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return ..() //No drifting in space for space carp! //original comments do not steal
/mob/living/simple_animal/hostile/scarybat/AttackingTarget()
. =..()
var/mob/living/L = .
/mob/living/basic/scarybat/melee_attack(atom/target, list/modifiers, ignore_cooldown = FALSE)
. = ..()
var/mob/living/L = target
if(istype(L))
if(prob(15))
L.Stun(2 SECONDS)
L.visible_message("<span class='danger'>\the [src] scares \the [L]!</span>")
//This mob is for the admin-only ancient vampire, DO NOT USE ELSEWHERE
/mob/living/simple_animal/hostile/scarybat/adminvampire
// This mob is for the admin-only ancient vampire, DO NOT USE ELSEWHERE
/mob/living/basic/scarybat/adminvampire
name = "bat swarm"
desc = "A swarm of vicious, angry-looking space bats."
speed = 1
harm_intent_damage = 25
maxHealth = 300
melee_damage_lower = 10
melee_damage_upper = 30
a_intent = INTENT_HARM
pass_flags = PASSTABLE
universal_speak = TRUE
universal_understand = TRUE
gold_core_spawnable = NO_SPAWN //badmin only
gold_core_spawnable = NO_SPAWN // badmin only
code/modules/mob/living/simple_animal/hostile/bear.dm → code/modules/mob/living/basic/hostile/bear.dm
+31 -25
View File
@@ -1,5 +1,5 @@
//Space bears!
/mob/living/simple_animal/hostile/bear
// Space bears!
/mob/living/basic/bear
name = "space bear"
desc = "You don't need to be faster than a space bear, you just need to outrun your crewmates."
icon_state = "bear"
@@ -7,53 +7,59 @@
icon_dead = "bear_dead"
icon_gib = "bear_gib"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak = list("RAWR!", "Rawr!", "GRR!", "Growl!")
speak_emote = list("growls", "roars")
emote_hear = list("rawrs", "grumbles", "grawls")
emote_see = list("stares ferociously", "stomps")
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
stop_automated_movement_when_pulled = FALSE
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
attack_verb_continuous = "mauls"
attack_verb_simple = "maul"
friendly_verb_continuous = "bear hugs"
friendly_verb_simple = "bear hug"
attack_sound = 'sound/effects/bite.ogg'
maxHealth = 60
health = 60
obj_damage = 60
melee_attack_cooldown_min = 1.5 SECONDS
melee_attack_cooldown_max = 2.5 SECONDS
melee_damage_lower = 20
melee_damage_upper = 30
attacktext = "mauls"
friendly = "bear hugs"
environment_smash = ENVIRONMENT_SMASH_STRUCTURES
attack_sound = 'sound/weapons/genhit3.ogg'
ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile_obstacles
//Space bears aren't affected by atmos.
// Space bears aren't affected by atmos.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
minimum_survivable_temperature = 0
faction = list("soviet")
gold_core_spawnable = HOSTILE_SPAWN
footstep_type = FOOTSTEP_MOB_CLAW
step_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/hostile/bear/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return TRUE //No drifting in space for space bears!
/mob/living/basic/bear/Initialize(mapload)
. = ..()
AddComponent(/datum/component/aggro_emote, emote_list = list("roars"))
/mob/living/simple_animal/hostile/bear/black
/mob/living/basic/bear/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return TRUE // No drifting in space for space bears!
/mob/living/basic/bear/black
name = "black bear"
icon_state = "black_bear"
icon_living = "black_bear"
icon_dead = "black_bear_dead"
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/black = 1)
/mob/living/simple_animal/hostile/bear/brown
/mob/living/basic/bear/brown
name = "brown bear"
icon_state = "brown_bear"
icon_living = "brown_bear"
icon_dead = "brown_bear_dead"
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1)
/mob/living/simple_animal/hostile/bear/polar
/mob/living/basic/bear/polar
name = "polar bear"
desc = "Found in the most extreme climates, its insides won't protect you from that kind of cold."
icon_state = "polar_bear"
@@ -61,16 +67,16 @@
icon_dead = "polar_bear_dead"
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/polar = 1)
//SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!!
/mob/living/simple_animal/hostile/bear/hudson
// SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!!
/mob/living/basic/bear/hudson
name = "Hudson"
desc = "Feared outlaw, this guy is one bad news bear." //I'm sorry...
desc = "Feared outlaw, this guy is one bad news bear." // I'm sorry...
icon_state = "combat_bear"
icon_living = "combat_bear"
icon_dead = "combat_bear_dead"
butcher_results = list(/obj/item/food/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1)
/mob/living/simple_animal/hostile/bear/hudson/Initialize(mapload)
/mob/living/basic/bear/hudson/Initialize(mapload)
. = ..()
var/unbearable_pun = pick("He's unbearably cute.", "It looks like he is a bearer of bad news.", "Sadly, he is bearly able to comprehend puns.")
desc = "That's Hudson. " + unbearable_pun // I am not sorry for this.
code/modules/mob/living/simple_animal/hostile/carp.dm → code/modules/mob/living/basic/hostile/carp.dm
+36 -34
View File
@@ -1,6 +1,6 @@
#define REGENERATION_DELAY 60 // After taking damage, how long it takes for automatic regeneration to begin for megacarps (ty robustin!)
#define REGENERATION_DELAY 60 // After taking damage, how long it takes for automatic regeneration to begin for megacarps
/mob/living/simple_animal/hostile/carp
/mob/living/basic/carp
name = "space carp"
desc = "A ferocious, fang-bearing creature that resembles a fish."
icon = 'icons/mob/carp.dmi'
@@ -9,14 +9,11 @@
icon_dead = "base_dead"
icon_gib = "carp_gib"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/carpmeat = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
emote_taunt = list("gnashes")
taunt_chance = 30
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
speed = 0
maxHealth = 25
health = 25
@@ -25,14 +22,19 @@
obj_damage = 50
melee_damage_lower = 15
melee_damage_upper = 15
attacktext = "bites"
melee_attack_cooldown_min = 1.5 SECONDS
melee_attack_cooldown_max = 2.5 SECONDS
environment_smash = ENVIRONMENT_SMASH_STRUCTURES
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("gnashes")
ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile_obstacles
//Space carp aren't affected by atmos.
// Space carp aren't affected by atmos.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
minimum_survivable_temperature = 0
maximum_survivable_temperature = 1500
faction = list("carp", "mining")
pressure_resistance = 200
gold_core_spawnable = HOSTILE_SPAWN
@@ -40,8 +42,8 @@
initial_traits = list(TRAIT_FLYING, TRAIT_SHOCKIMMUNE)
var/random_color = TRUE //if the carp uses random coloring
var/rarechance = 1 //chance for rare color variant
var/random_color = TRUE // if the carp uses random coloring
var/rarechance = 1 // chance for rare color variant
var/static/list/carp_colors = list(\
"lightpurple" = "#c3b9f1", \
@@ -63,12 +65,13 @@
"silver" = "#fdfbf3", \
)
/mob/living/simple_animal/hostile/carp/Initialize(mapload)
/mob/living/basic/carp/Initialize(mapload)
. = ..()
carp_randomify(rarechance)
AddComponent(/datum/component/swarming)
AddComponent(/datum/component/aggro_emote, emote_list = list("gnashes"))
/mob/living/simple_animal/hostile/carp/proc/carp_randomify(rarechance)
/mob/living/basic/carp/proc/carp_randomify(rarechance)
if(random_color)
var/our_color
if(prob(rarechance))
@@ -79,26 +82,26 @@
add_atom_colour(carp_colors[our_color], FIXED_COLOUR_PRIORITY)
update_icon()
/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return TRUE //No drifting in space for space carp! //original comments do not steal
/mob/living/basic/carp/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return TRUE // No drifting in space for space carp! //original comments do not steal
/mob/living/simple_animal/hostile/carp/AttackingTarget()
/mob/living/basic/carp/melee_attack(atom/target, list/modifiers, ignore_cooldown = FALSE)
. = ..()
if(. && ishuman(target))
var/mob/living/carbon/human/H = target
H.apply_damage(8, STAMINA)
/mob/living/simple_animal/hostile/carp/death(gibbed)
/mob/living/basic/carp/death(gibbed)
. = ..()
if(!random_color || gibbed)
return
update_icon()
/mob/living/simple_animal/hostile/carp/revive()
/mob/living/basic/carp/revive()
..()
update_icon()
/mob/living/simple_animal/hostile/carp/update_overlays()
/mob/living/basic/carp/update_overlays()
. = ..()
if(!random_color)
return
@@ -106,24 +109,24 @@
. += mutable_appearance(icon, "base_[stat == DEAD ? "dead_" : ""]mouth", appearance_flags = RESET_COLOR)
// We do not want mobs moving through space carp, we as such we block it if the mob is not dense
/mob/living/simple_animal/hostile/carp/CanPass(atom/movable/mover, border_dir)
if(isliving(mover) && !istype(mover, /mob/living/simple_animal/hostile/carp) && mover.density == TRUE && stat != DEAD)
/mob/living/basic/carp/CanPass(atom/movable/mover, border_dir)
if(isliving(mover) && !istype(mover, /mob/living/basic/carp) && mover.density == TRUE && stat != DEAD)
return FALSE
return ..()
// Since it's not dense we let it always hit
/mob/living/simple_animal/hostile/carp/projectile_hit_check(obj/item/projectile/P)
/mob/living/basic/carp/projectile_hit_check(obj/item/projectile/P)
return stat == DEAD
/mob/living/simple_animal/hostile/carp/holocarp
/mob/living/basic/carp/holocarp
icon_state = "holocarp"
icon_living = "holocarp"
maxbodytemp = INFINITY
maximum_survivable_temperature = INFINITY
gold_core_spawnable = NO_SPAWN
del_on_death = TRUE
basic_mob_flags = DEL_ON_DEATH
random_color = FALSE
/mob/living/simple_animal/hostile/carp/megacarp
/mob/living/basic/carp/megacarp
icon = 'icons/mob/alienqueen.dmi'
name = "Mega Space Carp"
desc = "A ferocious, fang bearing creature that resembles a shark. This one seems especially ticked off."
@@ -146,20 +149,19 @@
contains_xeno_organ = TRUE
surgery_container = /datum/xenobiology_surgery_container/megacarp
/mob/living/simple_animal/hostile/carp/megacarp/Initialize(mapload)
/mob/living/basic/carp/megacarp/Initialize(mapload)
. = ..()
name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]"
melee_damage_lower += rand(2, 10)
melee_damage_upper += rand(10, 20)
maxHealth += rand(30, 60)
move_to_delay = rand(3, 7)
/mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE)
/mob/living/basic/carp/megacarp/adjustHealth(amount, updating_health = TRUE)
. = ..()
if(.)
regen_cooldown = world.time + REGENERATION_DELAY
/mob/living/simple_animal/hostile/carp/megacarp/Life()
/mob/living/basic/carp/megacarp/Life()
..()
if(regen_cooldown < world.time)
heal_overall_damage(4)
code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+1 -1
View File
@@ -50,7 +50,7 @@
update_icons()
/mob/living/simple_animal/hostile/retaliate/carp/proc/carp_randomify(rarechance)
// Simplified version of: /mob/living/simple_animal/hostile/carp/proc/carp_randomify(rarechance)
// Simplified version of: /mob/living/basic/carp/proc/carp_randomify(rarechance)
var/our_color
our_color = pick(carp_colors)
add_atom_colour(carp_colors[our_color], FIXED_COLOUR_PRIORITY)