From 694577960f4c35e93bf1e0b0432347d0e08bedc8 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 27 Oct 2021 13:48:08 -0300 Subject: [PATCH] Adds a new dionae subspecies (#12649) --- aurorastation.dme | 1 + code/__defines/species.dm | 3 +++ code/game/antagonist/outsider/ninja.dm | 2 +- code/game/antagonist/station/vampire.dm | 1 + code/game/jobs/faction/eridani.dm | 1 + code/game/jobs/faction/nanotrasen.dm | 1 + code/game/jobs/job/captain.dm | 16 ++++++------ code/game/jobs/job/medical.dm | 23 +++++++++--------- code/game/jobs/job/security.dm | 13 ++++++---- code/game/machinery/body_scanner.dm | 1 + code/modules/background/citizenship/human.dm | 1 + code/modules/background/citizenship/ipc.dm | 1 + code/modules/background/citizenship/skrell.dm | 1 + code/modules/background/citizenship/tajara.dm | 3 +++ code/modules/background/citizenship/unathi.dm | 1 + code/modules/background/citizenship/vaurca.dm | 1 + .../preference_setup/loadout/loadout_xeno.dm | 3 ++- .../spawner/human/responseteams/tcfl.dm | 2 +- .../living/carbon/alien/diona/progression.dm | 2 +- .../human/species/station/diona/diona.dm | 2 +- .../species/station/diona/diona_subspecies.dm | 20 +++++++++++++++ html/changelogs/alberyk-diona.yml | 6 +++++ icons/mob/human_races/diona/r_hebe_diona.dmi | Bin 0 -> 2237 bytes 23 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 code/modules/mob/living/carbon/human/species/station/diona/diona_subspecies.dm create mode 100644 html/changelogs/alberyk-diona.yml create mode 100644 icons/mob/human_races/diona/r_hebe_diona.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 45f325899c0..dc3a005e7bd 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2156,6 +2156,7 @@ #include "code\modules\mob\living\carbon\human\species\station\monkey.dm" #include "code\modules\mob\living\carbon\human\species\station\slime.dm" #include "code\modules\mob\living\carbon\human\species\station\diona\diona.dm" +#include "code\modules\mob\living\carbon\human\species\station\diona\diona_subspecies.dm" #include "code\modules\mob\living\carbon\human\species\station\human\human.dm" #include "code\modules\mob\living\carbon\human\species\station\human\human_subspecies.dm" #include "code\modules\mob\living\carbon\human\species\station\ipc\ipc.dm" diff --git a/code/__defines/species.dm b/code/__defines/species.dm index 86d4f5b23a0..9b01627ea38 100644 --- a/code/__defines/species.dm +++ b/code/__defines/species.dm @@ -1,7 +1,10 @@ #define SPECIES_HUMAN "Human" #define SPECIES_HUMAN_OFFWORLD "Off-Worlder Human" + #define SPECIES_UNATHI "Unathi" + #define SPECIES_DIONA "Diona" +#define SPECIES_DIONA_HEBE "Hebe Diona" #define SPECIES_SKRELL "Xiialt Skrell" #define SPECIES_SKRELL_AXIORI "Axiori Skrell" diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 218fba309ae..ccb51dbba51 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -7,7 +7,7 @@ var/datum/antagonist/ninja/ninjas bantype = "ninja" landmark_id = "ninjastart" welcome_text = "You are an elite stealth agent. You can equip your suit with the latest technology using your uplink." - restricted_species = list(SPECIES_DIONA) + restricted_species = list(SPECIES_DIONA, SPECIES_DIONA_HEBE) flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_RANDSPAWN | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE | ANTAG_NO_FLAVORTEXT antaghud_indicator = "hudninja" required_age = 10 diff --git a/code/game/antagonist/station/vampire.dm b/code/game/antagonist/station/vampire.dm index 180107ddd71..8f437fc57d9 100644 --- a/code/game/antagonist/station/vampire.dm +++ b/code/game/antagonist/station/vampire.dm @@ -14,6 +14,7 @@ var/datum/antagonist/vampire/vamp = null SPECIES_IPC_SHELL, SPECIES_IPC_G1, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, diff --git a/code/game/jobs/faction/eridani.dm b/code/game/jobs/faction/eridani.dm index 167c7a6f15f..c9aaeb1e076 100644 --- a/code/game/jobs/faction/eridani.dm +++ b/code/game/jobs/faction/eridani.dm @@ -56,6 +56,7 @@ SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_UNATHI diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index 8283e0d6d3b..e658ef759d4 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -8,6 +8,7 @@ job_species_blacklist = list( "Corporate Liaison" = list( SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 65d7927bfe4..b4656d8525b 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -22,7 +22,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) outfit = /datum/outfit/job/captain - blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_DIONA_HEBE, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) /datum/outfit/job/captain name = "Captain" @@ -33,16 +33,16 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) head = /obj/item/clothing/head/caphat glasses = /obj/item/clothing/glasses/sunglasses id = /obj/item/card/id/gold - + headset = /obj/item/device/radio/headset/heads/captain bowman = /obj/item/device/radio/headset/heads/captain/alt double_headset = /obj/item/device/radio/headset/alt/double/captain wrist_radio = /obj/item/device/radio/headset/wrist/captain - + tab_pda = /obj/item/modular_computer/handheld/pda/command/captain wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/captain tablet = /obj/item/modular_computer/handheld/preset/command/captain - + backpack_contents = list( /obj/item/storage/box/ids = 1 ) @@ -103,7 +103,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) access_chapel_office, access_library, access_research, access_mining, access_mining_station, access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist) - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_DIONA_HEBE, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) /datum/outfit/job/hop name = "Head of Personnel" @@ -112,16 +112,16 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) uniform = /obj/item/clothing/under/rank/head_of_personnel shoes = /obj/item/clothing/shoes/brown id = /obj/item/card/id/navy - + headset = /obj/item/device/radio/headset/heads/hop bowman = /obj/item/device/radio/headset/heads/hop/alt double_headset = /obj/item/device/radio/headset/alt/double/hop wrist_radio = /obj/item/device/radio/headset/wrist/hop - + tab_pda = /obj/item/modular_computer/handheld/pda/command/hop wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/hop tablet = /obj/item/modular_computer/handheld/preset/command/hop - + backpack_contents = list( /obj/item/storage/box/ids = 1 ) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index aa63d7ed95f..aaa418df2e5 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -38,12 +38,12 @@ shoes = /obj/item/clothing/shoes/brown id = /obj/item/card/id/navy l_hand = /obj/item/storage/firstaid/adv - + headset = /obj/item/device/radio/headset/heads/cmo bowman = /obj/item/device/radio/headset/heads/cmo/alt double_headset = /obj/item/device/radio/headset/alt/double/cmo wrist_radio = /obj/item/device/radio/headset/wrist/cmo - + tab_pda = /obj/item/modular_computer/handheld/pda/medical/cmo wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/cmo tablet = /obj/item/modular_computer/handheld/preset/medical/cmo @@ -102,12 +102,12 @@ shoes = /obj/item/clothing/shoes/medical id = /obj/item/card/id/white suit_store = /obj/item/device/flashlight/pen - + headset = /obj/item/device/radio/headset/headset_med bowman = /obj/item/device/radio/headset/headset_med/alt double_headset = /obj/item/device/radio/headset/alt/double/med wrist_radio = /obj/item/device/radio/headset/wrist/med - + tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical tablet = /obj/item/modular_computer/handheld/preset/medical @@ -166,12 +166,12 @@ suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist shoes = /obj/item/clothing/shoes/chemist id = /obj/item/card/id/white - + headset = /obj/item/device/radio/headset/headset_med bowman = /obj/item/device/radio/headset/headset_med/alt double_headset = /obj/item/device/radio/headset/alt/double/med wrist_radio = /obj/item/device/radio/headset/wrist/med - + tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical tablet = /obj/item/modular_computer/handheld/preset/medical @@ -211,12 +211,12 @@ suit = /obj/item/clothing/suit/storage/toggle/labcoat/psych shoes = /obj/item/clothing/shoes/psych id = /obj/item/card/id/white - + headset = /obj/item/device/radio/headset/headset_med bowman = /obj/item/device/radio/headset/headset_med/alt double_headset = /obj/item/device/radio/headset/alt/double/med wrist_radio = /obj/item/device/radio/headset/wrist/med - + tab_pda = /obj/item/modular_computer/handheld/pda/medical/psych wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/psych tablet = /obj/item/modular_computer/handheld/preset/medical/psych @@ -242,7 +242,8 @@ access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_eva, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_external_airlocks, access_psychiatrist, access_first_responder) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_eva, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_external_airlocks, access_first_responder) outfit = /datum/outfit/job/med_tech - blacklisted_species = list(SPECIES_DIONA, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK) + + blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_HEBE, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK) /datum/outfit/job/med_tech name = "First Responder" @@ -252,12 +253,12 @@ uniform = /obj/item/clothing/under/rank/medical/first_responder shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/white - + headset = /obj/item/device/radio/headset/headset_med bowman = /obj/item/device/radio/headset/headset_med/alt double_headset = /obj/item/device/radio/headset/alt/double/med wrist_radio = /obj/item/device/radio/headset/wrist/med - + tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical tablet = /obj/item/modular_computer/handheld/preset/medical diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 95ade275ff1..db73a11a5c3 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -26,7 +26,7 @@ minimal_player_age = 14 outfit = /datum/outfit/job/hos - blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_IPC_G2, SPECIES_IPC_ZENGHU, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_DIONA_HEBE , SPECIES_IPC_G2, SPECIES_IPC_ZENGHU, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) /datum/outfit/job/hos name = "Head of Security" @@ -42,7 +42,7 @@ bowman = /obj/item/device/radio/headset/heads/hos/alt double_headset = /obj/item/device/radio/headset/alt/double/hos wrist_radio = /obj/item/device/radio/headset/wrist/hos - + tab_pda = /obj/item/modular_computer/handheld/pda/security/hos wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security/hos tablet = /obj/item/modular_computer/handheld/preset/security/hos @@ -88,7 +88,8 @@ minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_external_airlocks, access_weapons) minimal_player_age = 7 outfit = /datum/outfit/job/warden - blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_VAURCA_BULWARK) + + blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_HEBE) /datum/outfit/job/warden name = "Warden" @@ -198,7 +199,8 @@ minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_external_airlocks, access_weapons) minimal_player_age = 7 outfit = /datum/outfit/job/officer - blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_VAURCA_BULWARK) + + blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_HEBE) /datum/outfit/job/officer name = "Security Officer" @@ -249,7 +251,8 @@ minimal_access = list(access_security, access_sec_doors) outfit = /datum/outfit/job/intern_sec minimum_character_age = 18 - blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_VAURCA_BULWARK) + + blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_HEBE) /datum/outfit/job/intern_sec name = "Security Cadet" diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index fb298aeddb2..12dcd381ab5 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -39,6 +39,7 @@ SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_MONKEY ) diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index e4228dfc7c0..8bb08b389a4 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -65,6 +65,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, diff --git a/code/modules/background/citizenship/ipc.dm b/code/modules/background/citizenship/ipc.dm index 6d178e14f94..273d82ce09d 100644 --- a/code/modules/background/citizenship/ipc.dm +++ b/code/modules/background/citizenship/ipc.dm @@ -17,6 +17,7 @@ SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index a544e867feb..729fd83e6c0 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -21,6 +21,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index 2865ae4655a..de8e48867b6 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -20,6 +20,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, @@ -73,6 +74,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, @@ -127,6 +129,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index 3b5b628ef02..cbdfa83c92a 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -19,6 +19,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index d2c499027d1..9696356e5c8 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -20,6 +20,7 @@ SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_DIONA, + SPECIES_DIONA_HEBE, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index e3daac4b967..16b328f6cc0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -2,7 +2,8 @@ display_name = "gear harness" path = /obj/item/clothing/under/gearharness sort_category = "Xenowear" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP) + + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_HEBE, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP) /datum/gear/shoes/footwraps display_name = "cloth footwraps" diff --git a/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm b/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm index 144e348f437..54305a00f2b 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm @@ -6,7 +6,7 @@ max_count = 3 outfit = /datum/outfit/admin/ert/legion spawnpoints = list("TCFLERTSpawn") - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_HEBE) mob_name_prefix = "Vol. " /datum/ghostspawner/human/ert/tcfl/specialist diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index b7b2e84b6b2..a792468429d 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -8,7 +8,7 @@ src.forceMove(L.loc) qdel(L) - return SPECIES_DIONA + return SPECIES_DIONA_HEBE /mob/living/carbon/alien/diona/proc/grow() set name = "Exponential Growth" diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 91bfc80366f..4b4106d8724 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -5,7 +5,7 @@ category_name = "Diona" bodytype = BODYTYPE_DIONA total_health = 240 - age_min = 1 + age_min = 30 age_max = 1000 default_genders = list(NEUTER) selectable_pronouns = list(NEUTER, PLURAL) diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona_subspecies.dm new file mode 100644 index 00000000000..a3f9cad1655 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona_subspecies.dm @@ -0,0 +1,20 @@ +/datum/species/diona/hebe + name = SPECIES_DIONA_HEBE + name_plural = "Hebe Dionaea" + category_name = "Diona" + age_min = 1 + age_max = 200 + icobase = 'icons/mob/human_races/diona/r_hebe_diona.dmi' + mob_size = 10 + stomach_capacity = 8 + blurb = "Hebe are younger Dionae gestalts whose bark is not as developed as that of the Geras. When exactly a gestalt is no longer considered a Hebe is generally up to conditions they were \ + raised in, although bark-reduction treatments exist. Generally a gestalt remains a Hebe until they are about 80 years old, although some can be as old as 180. Due to having less bark than \ + their older counterparts, Hebe are faster but less resistant to damage. Due to their younger age, Hebe are also generally less experienced than older gestalts, as such they tend to look up \ + towards more experienced gestalts as a hand to help guide them. As a result of being more formative and idealistic, Hebe tend to be more pacifistic and less prone towards any kind of \ + violence, including against more simple-minded creatures such as monkeys." + + slowdown = 0 + siemens_coefficient = 0.7 + pain_mod = 2 + brute_mod = 1.1 + burn_mod = 1.3 \ No newline at end of file diff --git a/html/changelogs/alberyk-diona.yml b/html/changelogs/alberyk-diona.yml new file mode 100644 index 00000000000..cf2f02d6eb7 --- /dev/null +++ b/html/changelogs/alberyk-diona.yml @@ -0,0 +1,6 @@ +author: Alberyk, Frans + +delete-after: True + +changes: + - rscadd: "Added a new diona subspecies: diona hebe." \ No newline at end of file diff --git a/icons/mob/human_races/diona/r_hebe_diona.dmi b/icons/mob/human_races/diona/r_hebe_diona.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c0f5067b1225653070236d86a27806c6e39eabea GIT binary patch literal 2237 zcmV;u2txOXP)oGosiv8yg$GzP>yj0KmY&VXT#O00001bW%=J06^y0W&i*H zzIs$xbVOxyV{&P5bZKvH004NLjnc6Wf-n#U;JJN@26iLr>S7>s{T+2%3w^EKk!DFw^>a^QSF?k!^yc`cwIPi^&>k^`gFpr4? zV|ABEVLgTAl@v9Z4wgClV)Z7ANCA0@k=79Up7FWWG4nPRX+ztcElZJhrnihRCTpQ# zbn;Y<7#Wo;HV}*+rjN^hJDkt6HBapx;r=f)RYjG*Z}|n}L(UcXV4x2G00(_ZL_t(| zob8=GpPM)khY`YLOB>_fUg6#r(63?XV?%nX?3Jmq-{k6a_chOUF6S8uBNJG}?{1#T z5;JHJ;_Yv}I1WJ!1DoUYLN!>dVaipv_w`qqCmXcK#de3%YgPm>y{YDGNPiV}tbzkf zpTgr2ZC_OAm=?w6c@DSt^VdlOiFR1X)edeC(!&O&!>St6Uqc?gpdCiX4DB$i0(3xZ zlR^95{u;b2ki#lkqU~%Stx-B#BKyAn8Zz0#BVyGO7r?Uw9Z{G+qZ;Vx&zy9ZBKuqj znD*pO;woK<3??JIxv#&sd@fNNbCXkrA}$?{tCZ&_nA|3)f_nSECV31qSa4XBFazB* ze(v!Vre4wh`uj^MQ=AhN*hD9RiCo#((|;y5dFD(Acd-&H+d)8h5haD~AP}ecIkFuC zWR`D(*lac)Ub@dtX0!3&`JrrowvEmHAU0;J5ebgvv;uOE?eA*@K@bE%5X9uzs~O8C zs}J*^?b00*A^EfNsm@#VoUZ;xm^g_LW>lf3=fF>0RnO__Z-mFM3ETlMa#hbspa7)m zIbHpY%%qg?tn)l6(YJPy=1^i%^_;H$M%?@$wlFOViS-;&i8Tm7(Q~@`8<{P)3n+T= zsEm*zmS!o`c~w29tN%5tHK5mI3q>uykQLrxAr@eVs-Dx;|6+o+t9Z{seg4T#H?Ku0WA75*!rIKmQDJ*TVxB_LI%M7XCz3LBv(R~i2ICOV22 zuwBt}y81h8QNfEqgXPB@Mm$Tx3N^a2IOO06RXwMxzq9%hww^L3HV4?|y!3F8&_IM? z`2y04p3~Kz6|qonOX$(V#PNjxo2X)R%4czbj#$xiy863iq}?W6lnOSA#HUG+I78KQ zI{JGJ@>Ki(XCKTg*W{_CRh^pew1DQ5l7$I^AP9mW2!gOctDZBoKXdq;!;Br2G@i7>N$h!L4EZc(t`+sAP9mW{%bV$kB6B-qXlN& z`12mDZIFQb(v%Ck!$hB(EbiGi?+-I;8$H!rT(!Ra-ab&oZB!y2pV*AoHu9xtEDq)t z4-|2;Z{8oqZTT#6PmP_SBshlc1Kp*PU-qv4m8ipU4Iw>;3(fqR4fG57ND;qUh1=Q@ zrnyk0=kVtCnM881i*R@K@bE%5ClOG1VIqJ z!NW#7IyXpQEt1#0>8H{cmkN3 z?Kx^EEJ8g&WOEg9bs%VS=?|fIJwX{R9;T}u(C-!6gIPW?xy%#O(i6`Y#MA=1e^asp zUp??w#h7sT*B3z$1VIo4K@bFSfm!}^;|bCqxH{fTcR&G~gpxEa(r%yc9-eB>jU$7< zMDq`sX3Aq(+;N6(CQ!%5*~&Ehi^I9|JmXw~#j$G_H$2|U6UKnhv|~o~qL42g1H#k7 zyTY{60EZEKtutg@h~&CsKsh={*SPcnUQ(q^j{F(WBV92OYcz<_tF$R674Su4)OVJq z4!Y_(KMJ#hX{7{Ed}xqOeXujQ@sqzG8baAwjIR{H%m@ce0vA=YkRR=iH?``&2FR2-Yz#G(29KD z8Mjpx#U?1^?IqTB4Y?<|Scx|I9(C6Jl|K{^kgWoJuB|taFLiPDA z{T8z<^l{8vct{*iA#l-yp#SyBr2(VlLa!k_f_;`r(34Y2ZPGA_R9rmI8W(N~{T<)- zR}k@k;QJd+`)|#5W8v5MO7yLNswj8wPqn2m0O-~*=10jr(CvH*HH5Gqko5o*M*Wg~ zgvQ6OO}>t#g=Y~Fl(?OEw00000 LNkvXXu0mjftCvZE literal 0 HcmV?d00001