diff --git a/Content.Server/_Starlight/ShadekinSystem.cs b/Content.Server/_Starlight/ShadekinSystem.cs index 41d7acc9fce..50b4400e94a 100644 --- a/Content.Server/_Starlight/ShadekinSystem.cs +++ b/Content.Server/_Starlight/ShadekinSystem.cs @@ -19,6 +19,7 @@ using Content.Shared._Goobstation.Flashbang; using Content.Shared._Starlight.Flash.Components; using Content.Shared.Body.Components; using Content.Shared.Flash; // Delta V - Flash Work +using Content.Shared._DV.Body.Components; // Delta V - Remove various comps related to breathing namespace Content.Server._Starlight; @@ -68,6 +69,8 @@ public sealed class ShadekinSystem : EntitySystem { UpdateAlert(uid, component, (short)component.CurrentState); RemComp(uid); + RemComp(uid); + RemComp(uid); // No lungs = no CPR } private void OnEyeColorChange(EntityUid uid, ShadekinComponent component, EyeColorInitEvent args) diff --git a/Resources/Prototypes/_DV/Body/Species/shadekin.yml b/Resources/Prototypes/_DV/Body/Species/shadekin.yml index aaf340bb397..d2659d48ccf 100644 --- a/Resources/Prototypes/_DV/Body/Species/shadekin.yml +++ b/Resources/Prototypes/_DV/Body/Species/shadekin.yml @@ -68,7 +68,6 @@ Tongue: OrganShadekinTongue Appendix: OrganShadekinAppendix Ears: OrganShadekinEars - Lungs: OrganShadekinLungs Heart: OrganShadekinHeart Stomach: OrganShadekinStomach Liver: OrganShadekinLiver @@ -82,8 +81,7 @@ name: Urist McShadow parent: - AppearanceShadekin - - BaseSpeciesMob - - MobBloodstream + - BaseSpeciesMobOrganic id: MobShadekin components: - type: Shadekin @@ -176,36 +174,6 @@ # max: 1 # - !type:BurnBodyBehavior {} - # BaseMobSpeciesOrganic // Because we dont want respirator to be used. - - type: Barotrauma - damage: - types: - Blunt: 0.85 #per second, scales with pressure and other constants. - Heat: 0.1 - - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. - allowedStates: - - Alive - damage: - types: - Heat: -0.07 - Blunt: -0.07 - Piercing: -0.07 - Slash: -0.07 - - type: TemperatureSpeed - thresholds: - 293: 0.8 - 280: 0.6 - 260: 0.4 - - type: ThermalRegulator - metabolismHeat: 800 - radiatedHeat: 100 - implicitHeatRegulation: 500 - sweatHeatRegulation: 2000 - shiveringHeatRegulation: 2000 - normalBodyTemperature: 310.15 - thermalRegulationTemperatureThreshold: 2 - - type: Perishable - - type: entity parent: OrganBase id: OrganShadekin @@ -306,10 +274,6 @@ parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganShadekinInternal ] id: OrganShadekinEars -- type: entity - parent: [ OrganBaseLungs, OrganSpriteHumanInternal, OrganShadekinInternal, OrganShadekinMetabolizer ] - id: OrganShadekinLungs - - type: entity parent: [ OrganBaseHeart, OrganSpriteHumanInternal, OrganShadekinInternal, OrganShadekinMetabolizer ] id: OrganShadekinHeart