Adds Dionae to the game

SQL/beestation_schema.sql

@@ -141,6 +141,14 @@ CREATE TABLE IF NOT EXISTS `SS13_characters` (
 	`feature_human_tail` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`feature_human_ears` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`feature_psyphoza_cap` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_leaves` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_thorns` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_flowers` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_moss` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_mushroom` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_antennae` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_eyes` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_diona_pbody` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`helmet_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`preferred_ai_core_display` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
 	`preferred_security_department` VARCHAR(32) COLLATE 'utf8mb4_general_ci',

SQL/database_changelog.txt

@@ -1,15 +1,27 @@
 Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
 
-The latest database version is 7.2; The query to update the schema revision table is:
+The latest database version is 7.3; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 2);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 3);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 2);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 3);
 
 In any query remember to add a prefix to the table names if you use one.
 
 
 -----------------------------------------------------
+Version 7.3, 30 April 2024, by XeonMations
+Dionae - Species Addition
+
+ALTER TABLE `SS13_characters`
+	ADD COLUMN IF NOT EXISTS `feature_diona_leaves` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_psyphoza_cap`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_thorns` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_leaves`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_flowers` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_thorns`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_moss` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_flowers`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_mushroom` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_moss`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_antennae` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_mushroom`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_eyes` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_antennae`,
+	ADD COLUMN IF NOT EXISTS `feature_diona_pbody` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_eyes`;
 
 -----------------------------------------------------
 

beestation.dme

@@ -382,6 +382,7 @@
 #include "code\_onclick\hud\minebot.dm"
 #include "code\_onclick\hud\monkey.dm"
 #include "code\_onclick\hud\movable_screen_objects.dm"
+#include "code\_onclick\hud\nymph.dm"
 #include "code\_onclick\hud\pai.dm"
 #include "code\_onclick\hud\parallax.dm"
 #include "code\_onclick\hud\picture_in_picture.dm"
@@ -2396,6 +2397,7 @@
 #include "code\modules\client\preferences\entries\character\quirks\smoker.dm"
 #include "code\modules\client\preferences\entries\character\species_features\apid.dm"
 #include "code\modules\client\preferences\entries\character\species_features\basic.dm"
+#include "code\modules\client\preferences\entries\character\species_features\diona.dm"
 #include "code\modules\client\preferences\entries\character\species_features\ethereal.dm"
 #include "code\modules\client\preferences\entries\character\species_features\felinid.dm"
 #include "code\modules\client\preferences\entries\character\species_features\fly.dm"
@@ -2799,6 +2801,7 @@
 #include "code\modules\hydroponics\grown\cocoa_vanilla.dm"
 #include "code\modules\hydroponics\grown\corn.dm"
 #include "code\modules\hydroponics\grown\cotton.dm"
+#include "code\modules\hydroponics\grown\dionapod.dm"
 #include "code\modules\hydroponics\grown\eggplant.dm"
 #include "code\modules\hydroponics\grown\flowers.dm"
 #include "code\modules\hydroponics\grown\garlic.dm"
@@ -2814,7 +2817,6 @@
 #include "code\modules\hydroponics\grown\pumpkin.dm"
 #include "code\modules\hydroponics\grown\rainbow_bunch.dm"
 #include "code\modules\hydroponics\grown\random.dm"
-#include "code\modules\hydroponics\grown\replicapod.dm"
 #include "code\modules\hydroponics\grown\root.dm"
 #include "code\modules\hydroponics\grown\tea_coffee.dm"
 #include "code\modules\hydroponics\grown\tobacco.dm"
@@ -3123,6 +3125,7 @@
 #include "code\modules\mob\living\carbon\human\species_types\android.dm"
 #include "code\modules\mob\living\carbon\human\species_types\apid.dm"
 #include "code\modules\mob\living\carbon\human\species_types\debug.dm"
+#include "code\modules\mob\living\carbon\human\species_types\diona.dm"
 #include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
 #include "code\modules\mob\living\carbon\human\species_types\ethereal.dm"
 #include "code\modules\mob\living\carbon\human\species_types\felinid.dm"
@@ -3136,7 +3139,6 @@
 #include "code\modules\mob\living\carbon\human\species_types\mothmen.dm"
 #include "code\modules\mob\living\carbon\human\species_types\oozelings.dm"
 #include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm"
-#include "code\modules\mob\living\carbon\human\species_types\podpeople.dm"
 #include "code\modules\mob\living\carbon\human\species_types\psyphoza.dm"
 #include "code\modules\mob\living\carbon\human\species_types\pumpkin_man.dm"
 #include "code\modules\mob\living\carbon\human\species_types\shadowpeople.dm"
@@ -3317,6 +3319,7 @@
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\dolphin.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\frog.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\ghost.dm"
+#include "code\modules\mob\living\simple_animal\hostile\retaliate\nymph.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\spaceman.dm"
 #include "code\modules\mob\living\simple_animal\slime\death.dm"
@@ -3502,6 +3505,7 @@
 #include "code\modules\pool\pool_items.dm"
 #include "code\modules\pool\pool_moodlets.dm"
 #include "code\modules\pool\components\swimming.dm"
+#include "code\modules\pool\components\swimming_diona.dm"
 #include "code\modules\pool\components\swimming_dissolve.dm"
 #include "code\modules\pool\components\swimming_ethereal.dm"
 #include "code\modules\pool\components\swimming_felinid.dm"
@@ -4049,6 +4053,7 @@
 #include "code\modules\surgery\bodyparts\helpers.dm"
 #include "code\modules\surgery\bodyparts\robot_bodyparts.dm"
 #include "code\modules\surgery\bodyparts\species_parts\apid_bodyparts.dm"
+#include "code\modules\surgery\bodyparts\species_parts\diona_bodyparts.dm"
 #include "code\modules\surgery\bodyparts\species_parts\ethereal_bodyparts.dm"
 #include "code\modules\surgery\bodyparts\species_parts\ipc_bodyparts.dm"
 #include "code\modules\surgery\bodyparts\species_parts\lizard_bodyparts.dm"

code/__DEFINES/DNA.dm

@@ -57,6 +57,7 @@
 #define ACIDOOZE    /datum/mutation/acidooze
 #define MEDIEVAL    /datum/mutation/medieval
 #define SPORES      /datum/mutation/spores
+#define DRONE       /datum/mutation/drone
 
 #define UI_CHANGED "ui changed"
 #define UE_CHANGED "ue changed"
@@ -165,6 +166,11 @@
 #define ORGAN_SLOT_BRAIN_SURGICAL_IMPLANT "brain_surgical"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_WINGS "wings"
+#define ORGAN_SLOT_R_ARM_NYMPH "r_arm_nymph" //I can't think of any way of doing this better, please tell me if there is a better way.
+#define ORGAN_SLOT_L_ARM_NYMPH "l_arm_nymph"
+#define ORGAN_SLOT_R_LEG_NYMPH "r_leg_nymph"
+#define ORGAN_SLOT_L_LEG_NYMPH "l_leg_nymph"
+#define ORGAN_SLOT_CHEST_NYMPH "chest_nymph"
 
 //organ defines
 #define STANDARD_ORGAN_THRESHOLD 	100

code/__DEFINES/is_helpers.dm

@@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 #define isgolem(A) (is_species(A, /datum/species/golem))
 #define islizard(A) (is_species(A, /datum/species/lizard))
 #define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
-#define ispodperson(A) (is_species(A, /datum/species/pod))
+#define isdiona(A) (is_species(A, /datum/species/diona))
 #define isflyperson(A) (is_species(A, /datum/species/fly))
 #define isslimeperson(A) (is_species(A, /datum/species/oozeling/slime))
 #define isluminescent(A) (is_species(A, /datum/species/oozeling/luminescent))
@@ -122,6 +122,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define isdevil(A) (istype(A, /mob/living/carbon/true_devil))
 
+#define isnymph(A) (istype(A, /mob/living/simple_animal/hostile/retaliate/nymph))
+
 //Silicon mobs
 #define issilicon(A) (istype(A, /mob/living/silicon))
 

code/__DEFINES/mobs.dm

@@ -603,3 +603,6 @@ GLOBAL_LIST_INIT(available_random_trauma_list, list(
 #define STANDING_UP 0
 /// Mob is lying down, usually associated with lying_angle values of 90 or 270.
 #define LYING_DOWN 1
+
+// Species related bitflags go here.
+#define NOT_TRANSMORPHIC (1<<0) // This race can't become a changeling antagonist.

code/__DEFINES/species.dm

@@ -18,7 +18,7 @@
 #define SPECIES_SLIMEPERSON "slime"
 #define SPECIES_STARGAZER "stargazer"
 #define SPECIES_PLASMAMAN "plasmaman"
-#define SPECIES_PODPERSON "pod"
+#define SPECIES_DIONA "diona"
 #define SPECIES_PUMPKINPERSON "pumpkin_man"
 #define SPECIES_SHADOWPERSON "shadow"
 #define SPECIES_SKELETON "skeleton"
@@ -73,6 +73,9 @@
 #define FLAG_DEBUG_SPECIES	(1<<10)
 #define FLAG_MONKEY			(1<<11)
 #define FLAG_PSYPHOZA		(1<<12)
+#define FLAG_DIONA			(1<<13)
+
+#define FEATURE_NONE "None" //For usage in species_features, for checking for marking names.
 
 // Defines for used in creating "perks" for the species preference pages.
 /// A key that designates UI icon displayed on the perk.

code/__DEFINES/status_effects.dm

@@ -47,6 +47,8 @@
 
 #define STATUS_EFFECT_ANTIMAGIC /datum/status_effect/antimagic //! grants antimagic (and reapplies if lost) for the duration
 
+#define STATUS_EFFECT_PLANTHEALING /datum/status_effect/planthealing //! Grants the user healing at a given amount, used for diona health regeneration.
+
 //---------//
 // DEBUFFS //
 //---------//

code/__DEFINES/tools.dm

@@ -19,6 +19,7 @@
 #define TOOL_ROLLINGPIN "rollingpin"
 #define TOOL_RUSTSCRAPER "rustscraper"
 #define TOOL_BIKEHORN		"bike horn"
+#define TOOL_SEED "seed"
 // If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
 // tool sound is only played when op is started. If not, it's played twice.
 #define MIN_TOOL_SOUND_DELAY 20

code/__DEFINES/traits/declarations.dm

@@ -29,6 +29,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_INCAPACITATED "incapacitated"
 //In some kind of critical condition. Is able to succumb.
 #define TRAIT_CRITICAL_CONDITION "critical-condition"
+// Grants them the ability to move even when without any limbs.
+#define TRAIT_MOBILE "mobile"
 
 //mob traits
 #define TRAIT_BLIND "blind"
@@ -67,6 +69,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_RESISTHIGHPRESSURE	"resist_high_pressure"
 #define TRAIT_RESISTLOWPRESSURE	"resist_low_pressure"
 #define TRAIT_RADIMMUNE			"rad_immunity"
+#define TRAIT_NORADDAMAGE		"no_rad_damage"
 #define TRAIT_VIRUSIMMUNE		"virus_immunity"
 #define TRAIT_PIERCEIMMUNE		"pierce_immunity"
 #define TRAIT_NODISMEMBER		"dismember_immunity"
@@ -131,6 +134,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_XENO_IMMUNE "xeno_immune" //prevents facehuggers implanting races that wouldn't be able to host an egg
 #define TRAIT_NECROPOLIS_INFECTED "necropolis-infection"
 #define TRAIT_BEEFRIEND 		"beefriend"
+#define TRAIT_PLANTHEALING		"planthealing"
 #define TRAIT_MEDICAL_HUD		"med_hud"
 #define TRAIT_SECURITY_HUD		"sec_hud"
 #define TRAIT_DIAGNOSTIC_HUD "diag_hud"

code/__HELPERS/global_lists.dm

@@ -45,6 +45,15 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_stripes, GLOB.apid_stripes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_headstripes, GLOB.apid_headstripes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/psyphoza_cap, GLOB.psyphoza_cap_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_leaves, GLOB.diona_leaves_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_thorns, GLOB.diona_thorns_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_flowers, GLOB.diona_flowers_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_moss, GLOB.diona_moss_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_mushroom, GLOB.diona_mushroom_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_antennae, GLOB.diona_antennae_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_eyes, GLOB.diona_eyes_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_pbody, GLOB.diona_pbody_list)
+
 
 	//Species
 	for(var/spath in subtypesof(/datum/species))

code/__HELPERS/mobs.dm

@@ -100,6 +100,24 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_headstripes, GLOB.apid_headstripes_list)
 	if(!GLOB.psyphoza_cap_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/psyphoza_cap, GLOB.psyphoza_cap_list)
+	if(!GLOB.diona_leaves_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_leaves, GLOB.diona_leaves_list)
+	if(!GLOB.diona_thorns_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_thorns, GLOB.diona_thorns_list)
+	if(!GLOB.diona_flowers_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_flowers, GLOB.diona_flowers_list)
+	if(!GLOB.diona_moss_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_moss, GLOB.diona_moss_list)
+	if(!GLOB.diona_mushroom_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_mushroom, GLOB.diona_mushroom_list)
+	if(!GLOB.diona_antennae_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_antennae, GLOB.diona_antennae_list)
+	if(!GLOB.diona_eyes_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_eyes, GLOB.diona_eyes_list)
+	if(!GLOB.diona_pbody_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/diona_pbody, GLOB.diona_pbody_list)
+
+
 	//For now we will always return none for tail_human and ears.
 	return(
 		list(
@@ -128,7 +146,15 @@
 		"apid_stripes" = pick(GLOB.apid_stripes_list),
 		"apid_headstripes" = pick(GLOB.apid_headstripes_list),
 		"body_model" = gender == MALE ? MALE : gender == FEMALE ? FEMALE : pick(MALE, FEMALE),
-		"psyphoza_cap" = pick(GLOB.psyphoza_cap_list)
+		"psyphoza_cap" = pick(GLOB.psyphoza_cap_list),
+		"diona_leaves" = pick(GLOB.diona_leaves_list),
+		"diona_thorns" = pick(GLOB.diona_thorns_list),
+		"diona_flowers" = pick(GLOB.diona_flowers_list),
+		"diona_moss" = pick(GLOB.diona_moss_list),
+		"diona_mushroom" = pick(GLOB.diona_mushroom_list),
+		"diona_antennae" = pick(GLOB.diona_antennae_list),
+		"diona_eyes" = pick(GLOB.diona_eyes_list),
+		"diona_pbody" = pick(GLOB.diona_pbody_list)
 		)
 	)
 

code/_globalvars/lists/flavor_misc.dm

@@ -57,6 +57,15 @@ GLOBAL_LIST_EMPTY(apid_antenna_list)
 GLOBAL_LIST_EMPTY(apid_stripes_list)
 GLOBAL_LIST_EMPTY(apid_headstripes_list)
 GLOBAL_LIST_EMPTY(psyphoza_cap_list)
+GLOBAL_LIST_EMPTY(diona_leaves_list)
+GLOBAL_LIST_EMPTY(diona_thorns_list)
+GLOBAL_LIST_EMPTY(diona_flowers_list)
+GLOBAL_LIST_EMPTY(diona_moss_list)
+GLOBAL_LIST_EMPTY(diona_mushroom_list)
+GLOBAL_LIST_EMPTY(diona_antennae_list)
+GLOBAL_LIST_EMPTY(diona_eyes_list)
+GLOBAL_LIST_EMPTY(diona_pbody_list)
+
 
 GLOBAL_LIST_INIT(color_list_ethereal, list(
 	"Cyan" = "00ffff",

code/_globalvars/lists/names.dm

@@ -29,6 +29,7 @@ GLOBAL_LIST_INIT(oozeling_first_names, world.file2list("strings/names/ooze_first
 GLOBAL_LIST_INIT(oozeling_last_names, world.file2list("strings/names/ooze_last.txt"))
 GLOBAL_LIST_INIT(psyphoza_first_names, world.file2list("strings/names/psyphoza_first.txt"))
 GLOBAL_LIST_INIT(psyphoza_last_names, world.file2list("strings/names/psyphoza_last.txt"))
+GLOBAL_LIST_INIT(diona_names, world.file2list("strings/names/diona.txt"))
 
 GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
 GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt"))

code/_globalvars/traits/_traits.dm

@@ -172,7 +172,10 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRACKED_SENSORS_TRAIT" = TRACKED_SENSORS_TRAIT,
 		"TRAIT_SUIT_SENSORS" = TRAIT_SUIT_SENSORS,
 		"TRAIT_NANITE_SENSORS" = TRAIT_NANITE_SENSORS,
-		"TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE
+		"TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE,
+		"TRAIT_PLANTHEALING" = TRAIT_PLANTHEALING,
+		"TRAIT_NORADDAMAGE" = TRAIT_NORADDAMAGE,
+		"TRAIT_MOBILE" = TRAIT_MOBILE
 	),
 	/obj/item/integrated_circuit = list(
 		"TRAIT_COMPONENT_MMI" = TRAIT_COMPONENT_MMI,

code/_onclick/hud/nymph.dm

@@ -0,0 +1,8 @@
+/datum/hud/nymph
+	ui_style = 'icons/hud/screen_gen.dmi'
+
+/datum/hud/nymph/New(mob/living/simple_animal/hostile/retaliate/nymph/owner)
+	..()
+	healths = new /atom/movable/screen/healths()
+	healths.hud = src
+	infodisplay += healths

code/controllers/configuration/entries/game_options.dm

@@ -245,7 +245,7 @@
 /datum/config_entry/string/alert_delta
 	config_entry_value = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."
 
-/datum/config_entry/flag/revival_pod_plants
+/datum/config_entry/flag/diona_ghost_spawn
 
 /datum/config_entry/flag/revival_cloning
 

code/controllers/subsystem/traumas.dm

@@ -235,8 +235,7 @@ SUBSYSTEM_DEF(traumas)
 							"conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)),
 							"robots" = typecacheof(list(/datum/species/android)),
 							"the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)),
-							"aliens" = typecacheof(list(/datum/species/abductor, /datum/species/pod,
-							/datum/species/shadow)),
+							"aliens" = typecacheof(list(/datum/species/abductor, /datum/species/diona, /datum/species/shadow)),
 							"anime" = typecacheof(list(/datum/species/human/felinid))
 						)