]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Create Generic DamageOnInteract/Attacked Comps/Systems (#30244)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Fri, 9 Aug 2024 05:32:41 +0000 (22:32 -0700)
committerGitHub <noreply@github.com>
Fri, 9 Aug 2024 05:32:41 +0000 (15:32 +1000)
commitb266c9b545522c8598c744d820d58bdd0da5f866
tree18cb5338208879658ddab1d77ff07ef623df3565
parent8a4ef69e867db2361367425655b4f7c258cf665f
Create Generic DamageOnInteract/Attacked Comps/Systems (#30244)

* Everything but the submodule

* stuff I forgot

* heat

* missed lights

* behonky

* LocId

* I guess it was a skill issue?

* predicted audio

* It works with lights now

* Borg equality

* Gorilla gauntlet grants protection from anomaly returned damage when attacking it

* woops, there we go

* NONE

* Use DamageModifierSets, remove Behonker damage

* Reviews dealt with

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
25 files changed:
Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs [deleted file]
Content.Server/Light/Components/PoweredLightComponent.cs
Content.Server/Light/EntitySystems/PoweredLightSystem.cs
Content.Shared/Anomaly/Components/AnomalyComponent.cs
Content.Shared/Anomaly/SharedAnomalySystem.cs
Content.Shared/Damage/Components/DamageOnAttackedComponent.cs [new file with mode: 0644]
Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs [new file with mode: 0644]
Content.Shared/Damage/Components/DamageOnInteractComponent.cs [new file with mode: 0644]
Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs [new file with mode: 0644]
Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs [new file with mode: 0644]
Content.Shared/Damage/Systems/DamageOnInteractSystem.cs [new file with mode: 0644]
Content.Shared/Inventory/InventorySystem.Slots.cs
Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
Resources/Prototypes/Entities/Clothing/Hands/colored.yml
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml