diff --git a/Content.Server/ADT/PlasmaCutter/BatteryRechargeComponent.cs b/Content.Server/ADT/PlasmaCutter/BatteryRechargeComponent.cs new file mode 100644 index 00000000000..2ae112f0658 --- /dev/null +++ b/Content.Server/ADT/PlasmaCutter/BatteryRechargeComponent.cs @@ -0,0 +1,27 @@ +///TAKEN FROM: https://github.com/Workbench-Team/space-station-14/pull/327 + +namespace Content.Server.AruMoon.Plasmacutter; + +[RegisterComponent] +public sealed partial class BatteryRechargeComponent : Component +{ + + /// + /// NOT (material.Amount * Multiplier) + /// This is (material.materialComposition * Multiplier) + /// 1 plasma sheet = 100 material units + /// 1 plasma ore = 500 material units + /// + /// + [DataField("multiplier"), ViewVariables(VVAccess.ReadWrite)] + public float Multiplier = 1.0f; + + + /// + /// Max material storage limit + /// 7500 = 15 plasma ore + /// + [DataField("storageMaxCapacity"), ViewVariables(VVAccess.ReadWrite)] + public int StorageMaxCapacity = 7500; +} + diff --git a/Content.Server/ADT/PlasmaCutter/BatteryRechargeSystem.cs b/Content.Server/ADT/PlasmaCutter/BatteryRechargeSystem.cs new file mode 100644 index 00000000000..61cfd1db48b --- /dev/null +++ b/Content.Server/ADT/PlasmaCutter/BatteryRechargeSystem.cs @@ -0,0 +1,74 @@ +///TAKEN FROM: https://github.com/Workbench-Team/space-station-14/pull/327 + +using Content.Server.Materials; +using Content.Shared.Materials; +using Content.Server.Power.EntitySystems; +using Content.Server.Power.Components; + +namespace Content.Server.AruMoon.Plasmacutter +{ + + /// + /// This CODE FULL OF SHICODE!!! + /// + /// + public sealed class BatteryRechargeSystem : EntitySystem + { + [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; + [Dependency] private readonly BatterySystem _batterySystem = default!; + + + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMaterialAmountChanged); + SubscribeLocalEvent(OnChargeChanged); + } + + private void OnMaterialAmountChanged(EntityUid uid, MaterialStorageComponent component, MaterialEntityInsertedEvent args) + { + if (component.MaterialWhiteList != null) + foreach (var fuelType in component.MaterialWhiteList) + { + FuelAddCharge(uid, fuelType); + } + } + + private void OnChargeChanged(EntityUid uid, BatteryRechargeComponent component, ChargeChangedEvent args) + { + ChangeStorageLimit(uid, component.StorageMaxCapacity); + } + + private void ChangeStorageLimit( + EntityUid uid, + int value, + BatteryComponent? battery = null) + { + if (!Resolve(uid, ref battery)) + return; + if (battery.CurrentCharge == battery.MaxCharge) + value = 0; + _materialStorage.TryChangeStorageLimit(uid, value); + } + + private void FuelAddCharge( + EntityUid uid, + string fuelType, + BatteryRechargeComponent? recharge = null) + { + if (!Resolve(uid, ref recharge)) + return; + + var availableMaterial = _materialStorage.GetMaterialAmount(uid, fuelType); + var chargePerMaterial = availableMaterial * recharge.Multiplier; + + if (_materialStorage.TryChangeMaterialAmount(uid, fuelType, -availableMaterial)) + { + _batterySystem.TryAddCharge(uid, chargePerMaterial); + } + } + } + +} diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 0a0f2068b58..2352f7dec40 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -115,7 +115,27 @@ public float UseCharge(EntityUid uid, float value, BatteryComponent? battery = n RaiseLocalEvent(uid, ref ev); return delta; } + ///ADT plasmacutters start + public float AddCharge(EntityUid uid, float value, BatteryComponent? battery = null) + { + if (value <= 0 || !Resolve(uid, ref battery)) + return 0; + var newValue = Math.Clamp(battery.CurrentCharge + value, 0, battery.MaxCharge); + battery.CurrentCharge = newValue; + var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge); + RaiseLocalEvent(uid, ref ev); + return newValue; + } + public bool TryAddCharge(EntityUid uid, float value, BatteryComponent? battery = null) + { + if (!Resolve(uid, ref battery, false)) + return false; + + AddCharge(uid, value, battery); + return true; + } + ///ADT plasmacutters end public void SetMaxCharge(EntityUid uid, float value, BatteryComponent? battery = null) { if (!Resolve(uid, ref battery)) diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs index dc4858fd745..d124d55be22 100644 --- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs +++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs @@ -324,4 +324,17 @@ public int GetSheetVolume(MaterialPrototype material) return composition.MaterialComposition.FirstOrDefault(kvp => kvp.Key == material.ID).Value; } +///ADT plasmacutters start + public bool TryChangeStorageLimit( + EntityUid uid, + int value, + MaterialStorageComponent? storage = null) + { + if (!Resolve(uid, ref storage) || value < 0) + return false; + + storage.StorageLimit = value; + return true; + } +///ADT plasmacutters end } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl index 972be0364b7..de5cc982154 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl @@ -17,4 +17,9 @@ ent-ADTWeaponLaserCarbineBorg = лазерная винтовка борга .desc = от боргов, для боргов. ent-ADTWeaponDisablerBorg = дизаблер борга - .desc = дизаблер, не требующий зарядки. \ No newline at end of file + .desc = дизаблер, не требующий зарядки. + +ent-ADTWeaponCutter = плазменный резак + .desc = Инструмент шахтеров, предназначенный для расчистки горных пород. +ent-ADTWeaponCutterAdv = улучшенный плазменный резак + .desc = Инструмент шахтеров, предназначенный для расчистки горных пород. Обладает усовершенствованной батареей и усиленной концентрирующей линзой. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Research/arsenal.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Research/arsenal.ftl new file mode 100644 index 00000000000..71f4a916310 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Research/arsenal.ftl @@ -0,0 +1 @@ +research-technology-salvage-weapons-adv = Продвинутое оружие утилизаторов \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index 5488314ae11..655a6a2672e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -68,3 +68,54 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 20 + +- type: entity + name: Cutter + parent: BaseWeaponBatterySmall + id: ADTWeaponCutter + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Item + size: Normal + shape: + - 0,1,0,2 + - 1,1,1,1 + - 2,0,2,2 + - type: MaterialStorage + storageLimit: 0 + materialWhiteList: [RawPlasma, Plasma] + canEjectStoredMaterial: false + - type: BatteryRecharge + multiplier: 1.25 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/cutter.rsi + state: icon + - type: Gun + fireRate: 0.6 + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg + - type: ProjectileBatteryAmmoProvider + proto: ADTBulletCutter + fireCost: 100 + - type: Battery + maxCharge: 2500 + startingCharge: 2500 + - type: Appearance + +- type: entity + name: Advanced Cutter + parent: ADTWeaponCutter + id: ADTWeaponCutterAdv + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi + state: icon + - type: Gun + fireRate: 1 + soundGunshot: + path: /Audio/Weapons/plasma_cutter.ogg + - type: ProjectileBatteryAmmoProvider + proto: ADTBulletCutterAdv + fireCost: 75 + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e3a9e0171d5..31e02ebf7d6 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -67,4 +67,48 @@ soundHit: path: /Audio/Weapons/Guns/Hits/snap.ogg - type: StaminaDamageOnCollide - damage: 22 # 5 hits to stun sounds reasonable \ No newline at end of file + damage: 22 # 5 hits to stun sounds reasonable + +- type: entity + id: ADTBulletCutter + name: cutter bolt + parent: BaseBullet + noSpawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: "#9f1e86" + - type: GatheringProjectile + amount: 40 + - type: Projectile + deleteOnCollide: false + damage: + types: + Heat: 15 + - type: TimedDespawn + lifetime: 0.2 + - type: PointLight + radius: 2 + color: purple + energy: 1 + +- type: entity + id: ADTBulletCutterAdv + name: cutter bolt advanced + parent: ADTBulletCutter + noSpawn: true + components: + - type: Projectile + damage: + types: + Heat: 20 + - type: TimedDespawn + lifetime: 0.25 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml b/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml new file mode 100644 index 00000000000..8e27d4722ff --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml @@ -0,0 +1,20 @@ +- type: latheRecipe + id: ADTWeaponCutter + result: ADTWeaponCutter + completetime: 10 + materials: + Steel: 1100 + Glass: 200 + Gold: 300 + Plasma: 800 + +- type: latheRecipe + id: ADTWeaponCutterAdv + result: ADTWeaponCutterAdv + completetime: 10 + materials: + Steel: 1700 + Glass: 200 + Gold: 300 + Plasma: 900 + Diamond: 200 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Research/arsenal.yml b/Resources/Prototypes/ADT/Research/arsenal.yml new file mode 100644 index 00000000000..df4e6fad0da --- /dev/null +++ b/Resources/Prototypes/ADT/Research/arsenal.yml @@ -0,0 +1,13 @@ +- type: technology + id: AdvSalvageWeapons + name: research-technology-salvage-weapons-adv + icon: + sprite: ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 10000 + recipeUnlocks: + - ADTWeaponCutterAdv + technologyPrerequisites: + - SalvageWeapons \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7bdef979c4c..696166b1b9a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -343,6 +343,10 @@ - WeaponForceGun - WeaponLaserSvalinn - WeaponProtoKineticAccelerator + #ADT plasmacutters start + - ADTWeaponCutter + - ADTWeaponCutterAdv + #ADT plasmacutters end - WeaponTetherGun - ClothingBackpackHolding - ClothingBackpackSatchelHolding diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index e529708abbf..da0c2c0b166 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -165,6 +165,9 @@ - HitscanBatteryAmmoProvider - ProjectileBatteryAmmoProvider - Stunbaton + blacklist: # ADT plasmacutters start + components: + - BatteryRecharge # ADT plasmacutters end - type: entity parent: BaseItemRecharger @@ -191,6 +194,8 @@ blacklist: tags: - PotatoBattery + components: # ADT plasmacutters + - BatteryRecharge # ADT plasmacutters - type: entity parent: BaseItemRecharger diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 4673405e03f..d160e2b251f 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -47,6 +47,11 @@ path: /Audio/Effects/break_stone.ogg params: volume: -6 + - type: SoundOnGather #ADT plasmacutters start + - type: Gatherable + toolWhitelist: + tags: + - Pickaxe #ADT plasmacutters end # Ore veins - type: entity diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 6d76348baa5..34b4047228c 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -12,6 +12,7 @@ recipeUnlocks: - WeaponProtoKineticAccelerator - ShuttleGunKineticCircuitboard + - ADTWeaponCutter #ADT plasmacutter # These are roundstart but not replenishable for salvage - type: technology diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/icon.png new file mode 100644 index 00000000000..1e850c4eea2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-left.png new file mode 100644 index 00000000000..586301d6f1b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-right.png new file mode 100644 index 00000000000..096c8fb5d7d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/meta.json new file mode 100644 index 00000000000..9162568f912 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2b8b045d5a237147d736e3ba3c77c8cc5fb66cb5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/icon.png new file mode 100644 index 00000000000..c4e7c7178ef Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-left.png new file mode 100644 index 00000000000..5926d34e054 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-right.png new file mode 100644 index 00000000000..b95ceaf83ed Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json new file mode 100644 index 00000000000..9162568f912 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2b8b045d5a237147d736e3ba3c77c8cc5fb66cb5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png index 8846f209cbf..3b039845860 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png and b/Resources/Textures/Structures/Storage/morgue.rsi/crema_active_light.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png index 540b15234bb..0b322712434 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png and b/Resources/Textures/Structures/Storage/morgue.rsi/crema_closed.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png index 5626219773e..cffc4da65f8 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png and b/Resources/Textures/Structures/Storage/morgue.rsi/crema_contents_light.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png index 32730eedcb4..f12115e57e8 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png and b/Resources/Textures/Structures/Storage/morgue.rsi/crema_open.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png b/Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png index 57f9c47271b..c81f9903869 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png and b/Resources/Textures/Structures/Storage/morgue.rsi/crema_tray.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/meta.json b/Resources/Textures/Structures/Storage/morgue.rsi/meta.json index bdbd10ef961..1484fb353be 100644 --- a/Resources/Textures/Structures/Storage/morgue.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/morgue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/31d88c7454e429a64fbae4a9f7b4aecaf838e9a1", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/c7b4d6bd868de669ad96f1d3e4dc3702a3404355/icons/obj/structures/props/stationobjs.dmi", "size": { "x": 32, "y": 32 @@ -41,7 +41,25 @@ }, { "name": "morgue_open", - "directions": 4 + "directions": 4, + "delays": [ + [ + 0.3, + 1 + ], + [ + 0.3, + 1 + ], + [ + 0.3, + 1 + ], + [ + 0.3, + 1 + ] + ] }, { "name": "morgue_soul_light", diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png index d71250933d9..2e7cae18472 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_closed.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png index 88a4126b929..8f8c5f1de11 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nomob_light.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png index abdd7d8ccb5..b0aee50bbf4 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_nosoul_light.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png index 15ca16ae64a..98fdb57f30f 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_open.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png index 62f5e1c6783..76651bb58b0 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_soul_light.png differ diff --git a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png index d9edb8b218b..d96b8932c3b 100644 Binary files a/Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png and b/Resources/Textures/Structures/Storage/morgue.rsi/morgue_tray.png differ