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

* 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
+1 -1
View File
@@ -50,7 +50,7 @@
/obj/item/toy/plushie/carpplushie/dehy_carp/proc/make_carp()
// Make space carp
var/mob/living/simple_animal/hostile/carp/C = new /mob/living/simple_animal/hostile/carp(get_turf(src))
var/mob/living/basic/carp/C = new(get_turf(src))
// Make carp non-hostile to user, yes this means
C.faction |= list("syndicate", "\ref[owner]")
qdel(src)
@@ -43,7 +43,7 @@
name = "carp delivery grenade"
desc = "This grenade contains 5 dehydrated space carp in a similar manner to dehydrated monkeys, which, upon detonation, \
will be rehydrated by a small reservoir of water contained within the grenade. These space carp will then attack anything in sight."
spawner_type = /mob/living/simple_animal/hostile/carp
spawner_type = /mob/living/basic/carp
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=3"
+1 -1
View File
@@ -123,7 +123,7 @@
H.update_inv_legcuffed()
SSblackbox.record_feedback("tally", "handcuffs", 1, type)
else
if(istype(entered, /mob/living/simple_animal/hostile/bear))
if(istype(entered, /mob/living/basic/bear))
entered.apply_damage(trap_damage * 2.5, BRUTE)
else
entered.apply_damage(trap_damage * 1.75, BRUTE)