organ refactor

citadel.dme

@@ -291,6 +291,7 @@
 #include "code\__DEFINES\mobs\silicon_privileges.dm"
 #include "code\__DEFINES\mobs\sprite_accessories.dm"
 #include "code\__DEFINES\mobs\stat.dm"
+#include "code\__DEFINES\mobs\target_zone.dm"
 #include "code\__DEFINES\mobs\wounds.dm"
 #include "code\__DEFINES\objects\objects.dm"
 #include "code\__DEFINES\objects\type_generation.dm"
@@ -542,7 +543,7 @@
 #include "code\controllers\configuration\entries\urls.dm"
 #include "code\controllers\configuration_old\configuration.dm"
 #include "code\controllers\configuration_old\configuration_vr.dm"
-#include "code\controllers\observer_listener\atom\observer.dm"
+#include "code\controllers\repository\biologies.dm"
 #include "code\controllers\repository\designs.dm"
 #include "code\controllers\repository\flooring.dm"
 #include "code\controllers\repository\guidebook.dm"
@@ -790,7 +791,6 @@
 #include "code\datums\components\_component.dm"
 #include "code\datums\components\anti_magic.dm"
 #include "code\datums\components\connect_loc_behalf.dm"
-#include "code\datums\components\cyberpsychosis.dm"
 #include "code\datums\components\gps_signal.dm"
 #include "code\datums\components\horror_aura.dm"
 #include "code\datums\components\jousting.dm"
@@ -2059,6 +2059,7 @@
 #include "code\game\rendering\legacy\rigmech.dm"
 #include "code\game\rendering\legacy\robot.dm"
 #include "code\game\rendering\legacy\spell_screen_objects.dm"
+#include "code\game\rendering\legacy\zone_sel.dm"
 #include "code\game\rendering\legacy\intents\throwing.dm"
 #include "code\game\rendering\legacy\objects\waypoint_tracker.dm"
 #include "code\game\rendering\parallax\parallax.dm"
@@ -2477,6 +2478,21 @@
 #include "code\modules\awaymissions\pamphlet.dm"
 #include "code\modules\awaymissions\trigger.dm"
 #include "code\modules\awaymissions\zlevel.dm"
+#include "code\modules\biology\biology.dm"
+#include "code\modules\biology\biology_mob_state.dm"
+#include "code\modules\biology\biology_organ_state.dm"
+#include "code\modules\biology\types\crystalline.dm"
+#include "code\modules\biology\types\organic.dm"
+#include "code\modules\biology\types\simple.dm"
+#include "code\modules\biology\types\synthetic.dm"
+#include "code\modules\biology\types\organic\chimeric.dm"
+#include "code\modules\biology\types\organic\diona.dm"
+#include "code\modules\biology\types\organic\phoronoid.dm"
+#include "code\modules\biology\types\organic\plant.dm"
+#include "code\modules\biology\types\organic\promethean.dm"
+#include "code\modules\biology\types\organic\replicant.dm"
+#include "code\modules\biology\types\organic\xenomorph.dm"
+#include "code\modules\biology\types\synthetic\nanoswarm.dm"
 #include "code\modules\blob2\_defines.dm"
 #include "code\modules\blob2\announcement.dm"
 #include "code\modules\blob2\blobs\base_blob.dm"
@@ -3609,7 +3625,6 @@
 #include "code\modules\mob\mobility.dm"
 #include "code\modules\mob\movement.dm"
 #include "code\modules\mob\perspective.dm"
-#include "code\modules\mob\physiology.dm"
 #include "code\modules\mob\pulling.dm"
 #include "code\modules\mob\say.dm"
 #include "code\modules\mob\say_vr.dm"
@@ -3684,6 +3699,7 @@
 #include "code\modules\mob\living\living-defense-legacy.dm"
 #include "code\modules\mob\living\living-defense.dm"
 #include "code\modules\mob\living\living-inventory.dm"
+#include "code\modules\mob\living\living-physiology.dm"
 #include "code\modules\mob\living\living.dm"
 #include "code\modules\mob\living\living_defines.dm"
 #include "code\modules\mob\living\living_powers.dm"
@@ -3693,7 +3709,6 @@
 #include "code\modules\mob\living\mobility.dm"
 #include "code\modules\mob\living\movement.dm"
 #include "code\modules\mob\living\offense.dm"
-#include "code\modules\mob\living\organs.dm"
 #include "code\modules\mob\living\resist.dm"
 #include "code\modules\mob\living\say.dm"
 #include "code\modules\mob\living\status_procs.dm"
@@ -3713,8 +3728,11 @@
 #include "code\modules\mob\living\bot\secbot.dm"
 #include "code\modules\mob\living\bot\SLed209bot.dm"
 #include "code\modules\mob\living\carbon\breathe.dm"
+#include "code\modules\mob\living\carbon\carbon-death.dm"
 #include "code\modules\mob\living\carbon\carbon-defense.dm"
 #include "code\modules\mob\living\carbon\carbon-hands.dm"
+#include "code\modules\mob\living\carbon\carbon-life.dm"
+#include "code\modules\mob\living\carbon\carbon-organs.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
 #include "code\modules\mob\living\carbon\carbon_defense.dm"
 #include "code\modules\mob\living\carbon\carbon_defines.dm"
@@ -3725,8 +3743,6 @@
 #include "code\modules\mob\living\carbon\give.dm"
 #include "code\modules\mob\living\carbon\health.dm"
 #include "code\modules\mob\living\carbon\inventory.dm"
-#include "code\modules\mob\living\carbon\life.dm"
-#include "code\modules\mob\living\carbon\organs.dm"
 #include "code\modules\mob\living\carbon\perspective.dm"
 #include "code\modules\mob\living\carbon\physiology.dm"
 #include "code\modules\mob\living\carbon\rendering.dm"
@@ -3773,6 +3789,8 @@
 #include "code\modules\mob\living\carbon\human\human-damage.dm"
 #include "code\modules\mob\living\carbon\human\human-defense-legacy.dm"
 #include "code\modules\mob\living\carbon\human\human-defense.dm"
+#include "code\modules\mob\living\carbon\human\human-life-legacy.dm"
+#include "code\modules\mob\living\carbon\human\human-login-legacy.dm"
 #include "code\modules\mob\living\carbon\human\human.dm"
 #include "code\modules\mob\living\carbon\human\human_attackhand.dm"
 #include "code\modules\mob\living\carbon\human\human_defines.dm"
@@ -3783,10 +3801,6 @@
 #include "code\modules\mob\living\carbon\human\human_resist.dm"
 #include "code\modules\mob\living\carbon\human\human_species.dm"
 #include "code\modules\mob\living\carbon\human\inventory.dm"
-#include "code\modules\mob\living\carbon\human\inventory_legacy.dm"
-#include "code\modules\mob\living\carbon\human\life.dm"
-#include "code\modules\mob\living\carbon\human\login.dm"
-#include "code\modules\mob\living\carbon\human\logout.dm"
 #include "code\modules\mob\living\carbon\human\MedicalSideEffects.dm"
 #include "code\modules\mob\living\carbon\human\mobility.dm"
 #include "code\modules\mob\living\carbon\human\movement.dm"
@@ -3811,6 +3825,9 @@
 #include "code\modules\mob\living\carbon\human\traits\trait_groups.dm"
 #include "code\modules\mob\living\carbon\human\traits\weaver_objs.dm"
 #include "code\modules\mob\living\carbon\human\traits\weaver_recipies.dm"
+#include "code\modules\mob\living\physiology\global_physiology.dm"
+#include "code\modules\mob\living\physiology\local_physiology.dm"
+#include "code\modules\mob\living\physiology\physiology_modifier.dm"
 #include "code\modules\mob\living\silicon\damage_procs.dm"
 #include "code\modules\mob\living\silicon\death.dm"
 #include "code\modules\mob\living\silicon\emote.dm"
@@ -4248,22 +4265,36 @@
 #include "code\modules\nifsoft\software\13_soulcatcher.dm"
 #include "code\modules\nifsoft\software\14_commlink.dm"
 #include "code\modules\nifsoft\software\15_misc.dm"
+#include "code\modules\organs\organ-legacy-damage.dm"
+#include "code\modules\organs\organ-legacy-eating.dm"
+#include "code\modules\organs\organ-legacy-health.dm"
+#include "code\modules\organs\organ-legacy.dm"
+#include "code\modules\organs\organ-mappings.dm"
+#include "code\modules\organs\organ-tick.dm"
 #include "code\modules\organs\organ.dm"
+#include "code\modules\organs\external\external-wound.dm"
 #include "code\modules\organs\external\external.dm"
 #include "code\modules\organs\external\external_icons.dm"
 #include "code\modules\organs\external\robolimbs.dm"
 #include "code\modules\organs\external\wound.dm"
 #include "code\modules\organs\external\species\adherent.dm"
 #include "code\modules\organs\external\species\alraune.dm"
 #include "code\modules\organs\external\species\diona.dm"
+#include "code\modules\organs\external\species\naramadi.dm"
 #include "code\modules\organs\external\species\shadekin.dm"
 #include "code\modules\organs\external\species\skrell.dm"
 #include "code\modules\organs\external\species\slime.dm"
 #include "code\modules\organs\external\species\teshari.dm"
 #include "code\modules\organs\external\species\unathi.dm"
+#include "code\modules\organs\external\species\werebeast.dm"
 #include "code\modules\organs\external\species\xenos.dm"
-#include "code\modules\organs\external\subtypes\standard.dm"
-#include "code\modules\organs\external\subtypes\standard_vr.dm"
+#include "code\modules\organs\external\subtypes\standard-arm.dm"
+#include "code\modules\organs\external\subtypes\standard-chest.dm"
+#include "code\modules\organs\external\subtypes\standard-foot.dm"
+#include "code\modules\organs\external\subtypes\standard-groin.dm"
+#include "code\modules\organs\external\subtypes\standard-hand.dm"
+#include "code\modules\organs\external\subtypes\standard-head.dm"
+#include "code\modules\organs\external\subtypes\standard-leg.dm"
 #include "code\modules\organs\external\subtypes\stump.dm"
 #include "code\modules\organs\external\wounds\amputation.dm"
 #include "code\modules\organs\external\wounds\brute.dm"
@@ -4280,7 +4311,6 @@
 #include "code\modules\organs\internal\species\alraune.dm"
 #include "code\modules\organs\internal\species\diona.dm"
 #include "code\modules\organs\internal\species\replicant.dm"
-#include "code\modules\organs\internal\species\shadekin.dm"
 #include "code\modules\organs\internal\species\slime.dm"
 #include "code\modules\organs\internal\species\subspecies_graver.dm"
 #include "code\modules\organs\internal\species\subspecies_spacer.dm"
@@ -4848,6 +4878,7 @@
 #include "code\modules\species\species_getters.dm"
 #include "code\modules\species\species_helpers.dm"
 #include "code\modules\species\species_hud.dm"
+#include "code\modules\species\species_organ_entry.dm"
 #include "code\modules\species\species_shapeshift.dm"
 #include "code\modules\species\outsider\celestials.dm"
 #include "code\modules\species\outsider\replicant.dm"
@@ -4861,6 +4892,7 @@
 #include "code\modules\species\protean\protean_blob.dm"
 #include "code\modules\species\protean\protean_powers.dm"
 #include "code\modules\species\shadekin\blackeyed.dm"
+#include "code\modules\species\shadekin\shadekin-organs.dm"
 #include "code\modules\species\shadekin\shadekin.dm"
 #include "code\modules\species\shadekin\shadekin_abilities.dm"
 #include "code\modules\species\shadekin\shadekin_hud.dm"

code/__DEFINES/controllers/spatial_grids.dm

@@ -12,6 +12,7 @@
  * todo: /atom/movable/recover_spatial_grid(), macro should have components remade using that.
  */
 #define TYPE_REGISTER_SPATIAL_GRID(TYPEPATH, GRID) \
+##TYPEPATH{} \
 ##TYPEPATH/Initialize(...) { \
 	. = ..(); \
 	if(. == INITIALIZE_HINT_QDEL) { \

code/__DEFINES/mobs/biology.dm

@@ -1,7 +1,7 @@
 //* This file is explicitly licensed under the MIT license. *//
-//* Copyright (c) 2024 silicons                             *//
+//* Copyright (c) 2024 Citadel Station Developers           *//
 
-//* biology flags
+//* biology flags *//
 
 /// humanlike, organic, normal biology
 #define BIOLOGY_TYPE_HUMAN (1<<0)
@@ -13,12 +13,14 @@
 #define BIOLOGY_TYPE_CHIMERA (1<<3)
 /// protean
 #define BIOLOGY_TYPE_NANITES (1<<4)
+/// diona (legally not plant)
+#define BIOLOGY_TYPE_DIONA (1<<5)
 /// plant
-#define BIOLOGY_TYPE_PLANT (1<<5)
+#define BIOLOGY_TYPE_PLANT (1<<6)
 /// crystalline (adherent)
-#define BIOLOGY_TYPE_CRYSTALLINE (1<<6)
+#define BIOLOGY_TYPE_CRYSTALLINE (1<<7)
 
-#define BIOLOGY_TYPES_FLESHY (BIOLOGY_TYPE_HUMAN | BIOLOGY_TYPE_CHIMERA | BIOLOGY_TYPE_PLANT | BIOLOGY_TYPE_SLIME)
+#define BIOLOGY_TYPES_FLESHY (BIOLOGY_TYPE_HUMAN | BIOLOGY_TYPE_CHIMERA | BIOLOGY_TYPE_PLANT | BIOLOGY_TYPE_DIONA| BIOLOGY_TYPE_SLIME)
 #define BIOLOGY_TYPES_SYNTHETIC (BIOLOGY_TYPE_SYNTH | BIOLOGY_TYPE_NANITES)
 #define BIOLOGY_TYPES_ALL (ALL)
 

code/__DEFINES/mobs/life.dm

@@ -1,17 +1,38 @@
 //* This file is explicitly licensed under the MIT license. *//
-//* Copyright (c) 2023 Citadel Station developers.          *//
+//* Copyright (c) 2023 Citadel Station Developers           *//
 
 //* This file is called 'life', but realistically is the resting place of all things metabolism, health, and related. *//
 
-//?  Health - Core
-/** Round damage values to this value
+//* Health / Damage Simulation *//
+
+/**
+ * Round damage values to this value
  * Atom damage uses this too!
  */
 #define DAMAGE_PRECISION			0.01
+/**
+ * Round damage tier values to this value
+ * Atom damage uses this too!
+ */
 #define DAMAGE_TIER_PRECISION		0.01
+/**
+ * Round armor values to this value
+ * Atom damage uses this too!
+ */
 #define ARMOR_PRECISION				0.001
+/**
+ * Round armor tier values to this value
+ * Atom damage uses this too!
+ */
 #define ARMOR_TIER_PRECISION		0.01
 
+//* Life Ticking *//
+
+/// Should tick physical processes
+#define LIFE_TICK_PHYSICAL (1<<0)
+/// Should tick biological processes
+#define LIFE_TICK_BIOLOGICAL (1<<1)
+
 //* Health - Environmental Interactions *//
 
 /// % of temperature recovered when going towards favorable

code/__DEFINES/mobs/organs.dm

@@ -1,4 +1,103 @@
-//! *ALL DEFINES RELATED TO ORGANS GO HERE* !//
+//* Organ Flags *//
+
+/// This organ is abstract.
+///
+/// * Do not allow adding / removing by players.
+/// * Do not allow players to interact with it by any means, including by scanning it.
+#define ORGAN_FLAG_ABSTRACT (1<<0)
+#warn impl
+
+#warn DEFINE_BITFIELD
+
+//* Organ Discovery Flags *//
+
+/// Does not show up on simple scanners like cyborg analyzers.
+#define ORGAN_DISCOVERY_NO_SIMPLE_SCAN (1<<0)
+/// Does not show up on advanced imaging like body scanners.
+#define ORGAN_DISCOVERY_NO_ADVANCED_SCAN (1<<1)
+#warn impl
+
+#warn DEFINE_BITFIELD
+
+//*                                   Organ Keys                                      *//
+//* Organ keys are strings used to key the 'keyed_organs' list on carbons.            *//
+//*                                                                                   *//
+//* While usually arbitrary for an organ, they do have attached connotations of       *//
+//* what the organ will be casted to when fetched. As an example, ORGAN_KEY_BRAIN     *//
+//* will always be an organ of /obj/item/organ/internal/brain type.                   *//
+//*                                                                                   *//
+//* Organ keys should always be annotated in the below list with their expected type. *//
+
+//* Bodyparts *//
+
+#warn tag all the ext organs these describe!!!!
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_HEAD "head"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_CHEST "chest"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_LEFT_ARM "left_arm"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_LEFT_HAND "left_hand"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_RIGHT_ARM "right_arm"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_RIGHT_HAND "right_hand"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_GROIN "groin"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_LEFT_LEG "left_leg"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_LEFT_FOOT "left_foot"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_RIGHT_LEG "right_leg"
+/// External organ key for standard set.
+/// * Type: /obj/item/organ/external
+#define ORGAN_KEY_EXT_RIGHT_FOOT "right_foot"
+
+//* Common *//
+
+/// The key for brain organs.
+/// * Type: /obj/item/organ/internal/brain
+#define ORGAN_KEY_BRAIN "brain"
+/// The key for lung organs.
+/// * Type: /obj/item/organ/internal/lungs
+#define ORGAN_KEY_LUNGS "lungs"
+/// The key for eye organs.
+/// * Type: /obj/item/organ/internal/eyes
+#define ORGAN_KEY_EYES "eyes"
+
+//* Species - Shadekin *//
+
+/// The key for shadekin dimensional nodes
+/// * Type: /obj/item/organ/internal/shadekin/dimensional_cluster
+#define ORGAN_KEY_SHADEKIN_DIMENSIONAL_CLUSTER "shadekin-dimensional-cluster"
+
+//* Species - Xenomorph *//
+
+/// The key for xenomorph plasma vessels.
+/// * Type: /obj/item/organ/internal/xenomorph/plasmavessel
+#define ORGAN_KEY_XENOMORPH_PLASMA_VESSEL "xeno-plasma-vessel"
+
+#warn hook / implement
+
+//*                     Organ Default Lists                         *//
+//* Used in lists to overrule a host biology's default organ lists. *//
+
+/// Omit this organ.
+#define ORGAN_DEFAULT_OMIT "omit"
+
+//! legacy below !//
 
 //These control the damage thresholds for the various ways of removing limbs
 #define DROPLIMB_THRESHOLD_EDGE 5