Voidtamer ship additions + Tamed Carp (#22318)

Does primarily three things:

- Adds a new dock to the voidtamer ship so ships like the spark can
actually dock
- Adds a new armored carp, basically a reskinned dog that voidtamers can
have
- Minor fixes in the voidtamer ship

---------

Signed-off-by: Yonnimer <31339047+Yonnimer@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Yonnimer
2026-04-27 00:13:29 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 46380638df
commit 20780b3502
5 changed files with 474 additions and 219 deletions
@@ -89,6 +89,49 @@
icon_living = "columbo"
icon_dead = "columbo_dead"
/mob/living/simple_animal/hostile/commanded/dog/tamed_carp
name = "armored carp"
short_name = "carp"
desc = "A ferocious, fang-bearing creature that resembles a fish. This one is armored with a tanned hide and gold. It seems somewhat tame compared to a wild carp."
health = 125
maxhealth = 125
icon_state = "armored_carp"
icon_living = "armored_carp"
icon_dead = "armored_carp_dead"
icon_rest = "armored_carp_rest"
//Carp code
speak = list("Glub!", "Glub")
speak_emote = list("glubs!", "glubs")
emote_hear = list("glubs!", "glubs")
sad_emote = list("sad glubs", "pained glubs")
emote_sounds = NONE
meat_type = /obj/item/reagent_containers/food/snacks/fish/carpmeat
butchering_products = list(/obj/item/reagent_containers/food/snacks/fish/roe = 1)
organ_names = list("head", "chest", "tail", "left flipper", "right flipper")
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
can_be_milked = TRUE
udder_size = 3
milk_type = /singleton/reagent/toxin/carpotoxin
milk_regeneration = list(1, 2)
blood_overlay_icon = 'icons/mob/npc/blood_overlay_carp.dmi'
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
attack_emote = "nashes at"
flying = TRUE
lighting_alpha = LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE
/mob/living/simple_animal/hostile/commanded/dog/pug
name = "pug"
desc = "A small dog with a wrinkly muzzle."
+60
View File
@@ -0,0 +1,60 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: Yonnimer
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds a armored carp, effectively a tame carp for primarily voidtamers."
- rscadd: "Adds a new dock to the voidtamer ship that lets ships such as the spark dock with it."
- bugfix: "Fixes the waste pipe on the voidtamer ship."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 108 KiB

File diff suppressed because it is too large Load Diff
@@ -23,15 +23,15 @@
// --------------------- docks
/obj/effect/shuttle_landmark/voidtamer_trader/dock/west
name = "Dock, West"
landmark_tag = "nav_voidtamer_ship_west"
docking_controller = "airlock_voidtamer_ship_west"
/obj/effect/shuttle_landmark/voidtamer_trader/dock/north
name = "Dock, North"
landmark_tag = "nav_voidtamer_ship_north"
docking_controller = "airlock_voidtamer_ship_north"
/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/west
name = "Dock, West"
landmark_tag = "nav_voidtamer_ship_dock_west"
master_tag = "airlock_voidtamer_ship_west"
/obj/effect/map_effect/marker/airlock/docking/voidtamer_trader/dock/north
name = "Dock, North"
landmark_tag = "nav_voidtamer_ship_dock_north"
master_tag = "airlock_voidtamer_ship_north"
/obj/effect/shuttle_landmark/voidtamer_trader/dock/east
name = "Dock, East"