cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +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/game/objects/effects/spawners/random/misc_spawners.dm
+2 -2
View File
@@ -215,8 +215,8 @@
icon_state = "Carp"
spawn_loot_chance = 50
loot = list(
/mob/living/simple_animal/hostile/carp = 4,
/mob/living/simple_animal/hostile/carp/megacarp = 1
/mob/living/basic/carp = 4,
/mob/living/basic/carp/megacarp = 1
)
/obj/effect/spawner/random/rarely_meteor_strike
code/game/objects/items/dehy_carp.dm
+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)
code/game/objects/items/weapons/grenades/spawnergrenade.dm
+1 -1
View File
@@ -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"
code/game/objects/items/weapons/legcuffs.dm
+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)
code/game/objects/structures/monster_spawner.dm
+1 -1
View File
@@ -10,7 +10,7 @@
var/max_mobs = 5
var/spawn_time = 300 //30 seconds default
var/mob_types = list(/mob/living/simple_animal/hostile/carp)
var/mob_types = list(/mob/living/basic/carp)
var/spawn_text = "emerges from"
var/faction = list("hostile")
var/spawner_type = /datum/component/spawner
code/game/objects/structures/nest.dm
+1 -1
View File
@@ -75,5 +75,5 @@
spawn_mob_options = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast, /mob/living/simple_animal/hostile/asteroid/goldgrub)
/obj/structure/nest/carppuppy
spawn_mob_options = list(/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/pet/dog/corgi/puppy/void)
spawn_mob_options = list(/mob/living/basic/carp, /mob/living/simple_animal/pet/dog/corgi/puppy/void)
spawn_trigger_distance = 3