From 6c53685905cebba41f19aa16b14ba526e2b103f7 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Thu, 12 Sep 2024 00:06:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=80=D0=B5=D0=B7=D0=B0=D0=BA=D0=B8,=20?= =?UTF-8?q?=D1=80=D0=B5=D1=82=D0=B5=D0=BA=D1=81=D1=82=D1=83=D1=80=20=D0=BC?= =?UTF-8?q?=D0=BE=D1=80=D0=B3=D0=BE=D0=B2=20(#463)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Проверки** - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** :cl: Ratyyy - add: С секторов лун ару доставили технологии плазменных резаков! - tweak: Технология создания моргов потерпела дефект в чертеже. Работники фабрики моргов не заметили изменений и продолжили создавать морги с дефектными корпусами. - tweak: НТ сменили дизайн крематориев в угоду практичности. --- .../PlasmaCutter/BatteryRechargeComponent.cs | 27 +++++++ .../ADT/PlasmaCutter/BatteryRechargeSystem.cs | 74 ++++++++++++++++++ .../Power/EntitySystems/BatterySystem.cs | 20 +++++ .../Materials/SharedMaterialStorageSystem.cs | 13 +++ .../Entities/Objects/Weapons/Guns/Guns.ftl | 7 +- .../ru-RU/ADT/prototypes/Research/arsenal.ftl | 1 + .../Weapons/Guns/Battery/battery_gun.yml | 51 ++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 46 ++++++++++- .../Prototypes/ADT/Recipes/Lathes/armory.yml | 20 +++++ Resources/Prototypes/ADT/Research/arsenal.yml | 13 +++ .../Entities/Structures/Machines/lathe.yml | 4 + .../Entities/Structures/Power/chargers.yml | 5 ++ .../Entities/Structures/Storage/morgue.yml | 2 +- .../Entities/Structures/Walls/asteroid.yml | 5 ++ Resources/Prototypes/Research/arsenal.yml | 1 + .../Weapons/Guns/Battery/cutter.rsi/icon.png | Bin 0 -> 1065 bytes .../Guns/Battery/cutter.rsi/inhand-left.png | Bin 0 -> 1060 bytes .../Guns/Battery/cutter.rsi/inhand-right.png | Bin 0 -> 1052 bytes .../Weapons/Guns/Battery/cutter.rsi/meta.json | 22 ++++++ .../Guns/Battery/cutteradv.rsi/icon.png | Bin 0 -> 895 bytes .../Battery/cutteradv.rsi/inhand-left.png | Bin 0 -> 1059 bytes .../Battery/cutteradv.rsi/inhand-right.png | Bin 0 -> 1062 bytes .../Guns/Battery/cutteradv.rsi/meta.json | 22 ++++++ .../Storage/morgue.rsi/crema_active_light.png | Bin 0 -> 190 bytes .../Storage/morgue.rsi/crema_closed.png | Bin 0 -> 1636 bytes .../morgue.rsi/crema_contents_light.png | Bin 0 -> 196 bytes .../Storage/morgue.rsi/crema_open.png | Bin 0 -> 1644 bytes .../Storage/morgue.rsi/crema_tray.png | Bin 0 -> 777 bytes .../Structures/Storage/morgue.rsi/meta.json | 73 +++++++++++++++++ .../Storage/morgue.rsi/morgue_closed.png | Bin 0 -> 846 bytes .../Storage/morgue.rsi/morgue_nomob_light.png | Bin 0 -> 192 bytes .../morgue.rsi/morgue_nosoul_light.png | Bin 0 -> 188 bytes .../Storage/morgue.rsi/morgue_open.png | Bin 0 -> 1265 bytes .../Storage/morgue.rsi/morgue_soul_light.png | Bin 0 -> 212 bytes .../Storage/morgue.rsi/morgue_tray.png | Bin 0 -> 597 bytes 35 files changed, 403 insertions(+), 3 deletions(-) create mode 100644 Content.Server/ADT/PlasmaCutter/BatteryRechargeComponent.cs create mode 100644 Content.Server/ADT/PlasmaCutter/BatteryRechargeSystem.cs create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Research/arsenal.ftl create mode 100644 Resources/Prototypes/ADT/Recipes/Lathes/armory.yml create mode 100644 Resources/Prototypes/ADT/Research/arsenal.yml create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutter.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_active_light.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_closed.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_contents_light.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_tray.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_closed.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_nomob_light.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_nosoul_light.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_open.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_soul_light.png create mode 100644 Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_tray.png 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..70fbad1df75 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] + canEjectStoredMaterials: 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/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index 496ea416119..395088d17a1 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -82,7 +82,7 @@ mode: SnapgridCenter components: - type: Sprite - sprite: Structures/Storage/morgue.rsi + sprite: ADT/Structures/Storage/morgue.rsi #ADT morgue resprite layers: - state: crema_closed map: ["enum.CrematoriumVisualLayers.Base", "enum.StorageVisualLayers.Base"] 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 0000000000000000000000000000000000000000..1e850c4eea20e48dc67e367bea50bfb8bf7f4266 GIT binary patch literal 1065 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 HB{Ts517OzE literal 0 HcmV?d00001 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/ADT/Structures/Storage/morgue.rsi/crema_active_light.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_active_light.png new file mode 100644 index 0000000000000000000000000000000000000000..3b03984586078e7c6c423fddf8080ea900eaf282 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Dm+~rLn`LH zy=BPNV8FwA;Zfq9IX3H#e{j0Dgip!Bl0$Xkp6w;sc8z5jx1@l|85j&MnQf2TS@-(5 zl+=UB`YxVHjz8I2I_#P+er04}Xpp}({k7x6xYU(u!Pkvb85tV--F$QFjd|t17C*_o k|4Clul)1vxPvs1Ze$!kuT@QNH&jgw2>FVdQ&MBb@0Jr=@Qvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_closed.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..0b32271243459af41ead73bdd77a015e9af88dfc GIT binary patch literal 1636 zcmV-q2AlbbP)Px*9!W$&RCt{2TR(5xMil?q2sCM+I2ZGs4~Nc5!-o%H`))w%hHcWm#|>$A|!g z5X5n;tpv*Nd7iLM5CoauuImch`o1sZf5aniG#Vg;004%=AuP+%kvoStj?ri|0DzWD zl@ikYK@bS}J;Mqq9{_9GC^e=Dt;aA`Fvi8KT&|= zIG9eS!j1qio6S(IR+Xg;)9IA^hIIIKxM#CjA^t=Ggb>tfHDSj%j$zw2DwT?|jN@21 zPOVnsz9Aic9d6sU3-Kq5pz00K)l>&EAEa*}ilSVfP4FiQAcUaVY-%qwgb<8IBkr?$ zy)G1@R;%IW=7u|-jK3_OieK9TSU8ST>hoCE0?P8K__ZzIn>TOp>b1N-?l~IRZ+XCpoZ(qIww$uVx8Fl!zE#UU(=w7Rz2Hr*s zU}ek9YT>~2i9 zcTfAZ$O=UDMFJoeyvegXi2~?uj5hE*4@FL7hQp!oS-0Cwl*RIh_~STU>Fu+i%3yi8 zF5tQ@eBUp95W>RueR!USFbuWYuW|?@8Nu>9U}0bXR;4zo|7y<_>@&5TaP?b$yWPwg1HG$H^RR79K$erh{R~opRymCkfsRQCNqE>CfHm+g0lp&Enju0F$8qLV zNQNK?;JPk)y`B-?Mx&8duslPAXYwX9M2cWtyzO>7qlDaUP{;h(u$Y#F5KJZ$OePbA zVW@r4Dgz+|VHhUk(lJFc$iSPMG88TfnxLRclqiC9;)ChXTzMW)6xC`qm#N`-UZL1O z2!hNpJI($usZa9%g;aJ`0fsXI!V#@eXWxu3VJak1Lb68DT-1GNGBq&n9XKd>2gItU4WMY zCzC}7r4*1!L`Z?A($SPP6M>B5I7#{&F9l8{i!MrCkCXj<{Qc{1!2Ujv3U=7gl?E+k zE;&VgEX&FSSRz^I7~0q4BAD2iIF6IV_^Nn-wlT%4LQVnnT;Jr?G==U$Xd;A8gIYou zhS=TBdcDvB*0B}Vh3QR@Y`o0Yu-$Gi7mGzsOaB$nxk-0}!2LpFSr!(H1v;G$02nLj z*mV5GVv(sc$<^s}GUM~WwE&Z6@;tD&Ko4;%MCZg>fb=WC1~a?>N4GBhtO%zGZW*Uk z0qJ<2qEe~k+UeHmykQ>aD%>hgWgMV$v7lS0!pX^rFisHtmx-#*aUAL1Vyj%>L+2S> zoa5W?p5p1(U&%z%#?`y`_^bK@P(}d{?E;-W;Ga)_U%h)TZCeDLJ>W|4Y^z*g6WA&j z*aR{P7z_qG>AU)ec7b%}hRHSH^5f^<%72|@@sKX?`0_kS!v4K*Z!ui=s@xjz&@OOs iaj}*_C=5ekZ1FFQ^WWg(Czn$I0000O5T>Ln`LH zy>*bY!GMSL!Xu7#k9ho6_C3PkKI=l7xpP+ut zEeCAtJ9H*BGP<;^`z;|jTTLD){bS+lV8cJfhLO|jQf5^x(_>)x5V*SZn|XH8>eCaq om&zopr08Wxcj{pDw literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_open.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_open.png new file mode 100644 index 0000000000000000000000000000000000000000..f12115e57e85c52ac7686a7cc1d17d623dc84bbf GIT binary patch literal 1644 zcmV-y29x=TP)Px*CP_p=RCt{2TR(5xMil?q2t0Y9I0Ocf#i-f_lHe-lD4_6GpeXwd1bv5i%90^V zCi??)DFgxi0xSY_D-2|0>=?9=Itru$!NKStap0su>fjuEJl;Q2CtGd$Th2P(z2CdX zcgJ^k&s&h7-EJ>s&#K_!;$o{z`;(KC@vDrJt2j+Ov0olbFidAW7p{M+oqX0xdzpU>x*PN&*ZrKpNS$8W+tpU+G2X9n;* z53|`!+7STKG{x@juC`QRHk%3GkO{vDcbcZ9_%j0#LQt#Kq#ctaf$O^1+1b&SNs>tA z)M_>18#3WH;dWiO6o0k|>fQidO--PhgY*qdr_(~8`{2(EKnOvz*)(2g2q74aM#5+H zdR?kStyaU;)s;}5ioYtKj^Ee=czB*y>GN3C1FG`r_>Dc_t2b}(`1v!ud+`$2hld;K z0lbbT{Kg(Y1wVfN4A;N@wvisd>uADn>;Y8pyB9Bk4fOzCM-zTy54b)&ytV2l!JFs- zypAUPIS&ACLquD#KM#J;EbfcHuo>bZ3o1-^W2+8E71WsY)$wNr5Lw6fed#`%-;JsE z?(Dpld4a6HOaR0~Gfpv;NPa5$7c>vp@Dv3MRCf086Cy?q|k7(9<~ z3i!T{FbpdngzyN%5J3Rh%CiE6aAKzqCPsP z_}2+(AjE<`E4vWM@cJ*{k)-`y7=h*2?gap#*Xvax>i7GFx+sd^A}dfGQ_J_!*=Mt#TS81C>b#$$0o2 zfHm+g0kI+0nju1wBuVa6NQEeh;QKxXgMk&^Mx((RSe+pva(SB>B4w~H-gdj4GeTiE zXySfnXJ^8a5Q52Mg2`lpIF5}!n<@}O5XW&Qm&%mspn_;@Mxk&S&;$itqC^?6i4Qh{ zBNj&I0cEheyIaWA2!fzgC>=#n?wFlsf7moCg>?gnKrc|%-KPpZ`zcV#0QBUBFM)ps zo~CK0?Aa^xBXJ70k0|*{r9&B1ngT~RH~8^~?{IW;13;go7>1!Tm6Zp*m{Eap^175o zB?GXD2t3j>HA3W>( z?cw*Ieg^jT04CVsLsuHKRJr7o^>G|07huVBp)!oG$7QgwG4VVvi}7{w0BvK7SBHWD z;y6aD)v|guO<}qa+6bXpP)~^C7~9+VSugc~b!>%AVS5v#l9$^Ww%hIHVzDS#>AwOx zHsx**xLs%*$H8K;K&R6I0Ba?cP312Zi(H*eu1=?ulP`kM160?`Ho)Hk-NmgC9TV>X z%C7()%!mRU(>nH98BQDADo&*V*m#~|XJ@C-&a}?t4U0He;ns0#;{cP31=BhmdcB@B zPLTbViLQ?RmVH_`Y6^VpJcW-_eErQ6Jo)kqm1@Q~fByl0ygdg{Ayf3Or$FZ+@aLz$ z&)JdW# literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_tray.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/crema_tray.png new file mode 100644 index 0000000000000000000000000000000000000000..c81f9903869a0996d133007272c55b0ef92b5b51 GIT binary patch literal 777 zcmV+k1NQuhP)Px%!%0LzRCt{2nlX;6Fc5}^C?}W_qnD2JfQ1(04Hy`CoW5iFO! z0|CkIM2qBv5^$K-egE0p3JfFOtu8~qgS(fm8J~P)n zVzP@JKy3ED4U91%;)sT~0<5)==lSSyYj`K1C<;(YjUKm#cLJs!z9@-PVM1=GC+y?V1hr^*k z#P&0%Pa#AD@I7T~ttXSgO2F~!41fPrZ2%kv9KX&`mL;eANf2@N?4pzct@Y$JtOU@* z1GvWk`n9@kUPVeds~txzL1uxfsuo`rc4KfsW{kt;W`U_?xV6^1zs;=#m%cwM0aD6V z(i{c&NYIz16_^y@+aUHBkQ9&<@PP{OS%(08m+k7hX7!yE;M>3$1Bf_!49(ICWZPkK zgfR%|M%i808W5D^d&thMY1qBa2F^y3^tx>1$_h~x1H z_xpXa!g9G>8l{w1!hGN=fQvH$TI)<}4MK><7z3x%shPT-eyLEKqD$8#*|R{*U0#}f zj4><)kQ?QUU7On-j_pMfi9{liNF?5d%(b=;!Q=55Tvo@3WlzAsQp&b~(my}MeywUxKLD3)^@*$R0I4m<8SdA3p=qc%!6{hGiEXUS*!i7nyZP1Q z5Z2mX0gYW7I=-FDUcP!9LTjD%6)^TLPw4n|Av<4Uqa<{EQ54`qQoy?^fIGq`1-z>Q zxEmL5sQ}tz=%0(Bfb4d=t!6;T3s`Fb5&ttqLWrhY)A#L{81n-3U7u_$^P!-J2l#D< zy5FtEe(f6q3@>}>;a5*Uhz-ms#$I9nIk$Q}AdyHU5}(XJF+!?%6rWzW00000NkvXX Hu0mjfvNd8r literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/meta.json b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/meta.json new file mode 100644 index 00000000000..1484fb353be --- /dev/null +++ b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/meta.json @@ -0,0 +1,73 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/c7b4d6bd868de669ad96f1d3e4dc3702a3404355/icons/obj/structures/props/stationobjs.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "crema_active_light", + "directions": 4 + }, + { + "name": "crema_closed", + "directions": 4 + }, + { + "name": "crema_contents_light", + "directions": 4 + }, + { + "name": "crema_open", + "directions": 4 + }, + { + "name": "crema_tray", + "directions": 4 + }, + { + "name": "morgue_closed", + "directions": 4 + }, + { + "name": "morgue_nomob_light", + "directions": 4 + }, + { + "name": "morgue_nosoul_light", + "directions": 4 + }, + { + "name": "morgue_open", + "directions": 4, + "delays": [ + [ + 0.3, + 1 + ], + [ + 0.3, + 1 + ], + [ + 0.3, + 1 + ], + [ + 0.3, + 1 + ] + ] + }, + { + "name": "morgue_soul_light", + "directions": 4 + }, + { + "name": "morgue_tray", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_closed.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..2e7cae18472208353797d3844d5bea1059436591 GIT binary patch literal 846 zcmV-U1F`&xP)Px&2uVaiRCt{2o3W0gFc5}^Q=Wig3$$fQM3XX7M19h|%s$AzOr)(5Qp$9cG$%za zw(u+DDsu!3{%wzOcGq8%U1G-L-`Hd0Nk$s#y1whK`_eQ`hLqc~{@I1PuJ1)r4F4Yv zhvDz*_3Gt-5W*_3w}yPrv_A`*9B96iVB+R^?Bp6I2coAa>)4i1zz^5W7YJ z&gcJ)5A|pwgsOWcKv5JVgwPgVx{l)0h|Pw85F(h`J_1G?0#n9OL5FXoSYopwfN(p$ z(edT++U1kz_43Z)(<XcuelgC*(day1GND}1TF$I|B-HVY}O0Da$6 zp6Ar}J#1(R)nm#g0!O_%boI{!7(Zg_k>jWowH0#F1TTfTmcXvIIO|U&5{X12u}DUQ zrKL4ZlX0i7sf?`6^9AFblw#Wyx#nq>WNf61Zc$VbpF+M&$2!Lc&m?}`;bBbfK=~LGrz%%yj z7VK0;hRul&HzDkzHnXa#?#OHC5U;D%+usm&(Ke-ZKx_wMGYEj5$NQYubK~mkxLkSy zVmlCG8Cs=6b+$Z=Gzv#A{6wu`oDXQS44d;)f3N01vhx!rE+m)z_>mq&g5 Y2lQRy>L$putN;K207*qoM6N<$g2^O^=Kufz literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_nomob_light.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_nomob_light.png new file mode 100644 index 0000000000000000000000000000000000000000..8f8c5f1de11770d43c617374d405fd9d8e131641 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sytmBLn`LH zy|t0E!9c(vu#hGCcmdn;D?N|Y#PW)+nQ=+^9Qm&B_jypu1QXtvuC4u-cp0uFc_kk) zlespF&VZ`GRq|UAZgr7|Lhgx}zAM%&?T%Yqx1b<;$XS ko3P}|-+zQMGB6yle^Vl3<9hnjX(5nKPgg&ebxsLQ03bC)aR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_nosoul_light.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_nosoul_light.png new file mode 100644 index 0000000000000000000000000000000000000000..b0aee50bbf4f549d8aa01ca2573d59661df63f00 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|$~;{hLn`LH zy>*bYK|!J+Fta&to0GG($LB5Xb9al(cp<-+{hqyu$i*oSF3x+FT*Ax{IAxDq^(_6x zPp*1i>}F+nFppaXXbc0xf%~SFhFw1-7iI?^Dc^o;*~-!r*Jm_bWLzBTdtlo1YqINI ibAHY1*li6|x}}_nVYWu0Uh&R-Af2ABelF{r5}E)pdqy_^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_open.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_open.png new file mode 100644 index 0000000000000000000000000000000000000000..98fdb57f30ff9c4e3e1f0ca8b348927533b52710 GIT binary patch literal 1265 zcmVFF`AMaP$G?}SK2dh2j(1b2O2Ig z($;7sN;*m!q!GmyT!EF*njIWFe$RQ&zmxcrRpbL2u=S^z=0AduaUf!*QplOh_8w8sfiFzcY3!iP9e%f~aTiq!Dm+b!Bq6 zySp);RPDh zX|Klg*mWpUe{uyHl6Av1=ufgh!|nhvv+ZQTP5|6%?fR1|(6HFi_Zs;d=dy7P`jacr zm>aA*;juLH`l!?ibMoVtPS!z~g60owe9pKG4oQ7A1Gt^fncitkcTxH(2IT(02BoS* z^T#_VqgGm9r9L3{`;@AZRHNPBb2^7IYNhq7sSnsK^k;F@jsaBMh@*@et;!jsKHLE6 zh_j9q3RL+kW& zZ#en+TKZ@cL_!cJsY&CJSRDNt9*K1f?J-t_ocE!e`ETpW=zK~2nmXS?GJtaFbtq@v zk(+yi*4L!yEC}7`)vCVq_%;m%(+mJ3X26_s_DdpWK&fYl)vBM1hylBWW;RPeG9Z=n zuH9&~z9#J;45rh1Vg+ZNXniD|Mnw!Ym!6ZKuc?oug&;7^05GEr$W3I`PN*%VFF_jt zV44A7S_lF&%7ENldhMM4Qu-2n8laK)PR+TmK_5wneCC(dLwC6PNV00000NkvXXu0mjf-8E#^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_soul_light.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_soul_light.png new file mode 100644 index 0000000000000000000000000000000000000000..76651bb58b0be2c7855f9a4f083e7189cd52cff3 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|`aE46Ln`LH zy}6OM*+9VIqW8B1*6TVGjl2y6x;MCFg?&(1;wO62aO2!P;YyAB_)bnL75s3`_V~qJ zj19suUU9Rom-uY|`!w=ikj=EcFRFEU#brK5+cPv6?>N8+G@XIr&u%U0#g)Ey*UsH{ z>&oMMYqz|NvQ9B!yI{3o>mtS{x>w)*i0Joy{PJT7I|D<*uXzP`lrCRqb4def^>p=f JS?83{1OVx4R7wB< literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_tray.png b/Resources/Textures/ADT/Structures/Storage/morgue.rsi/morgue_tray.png new file mode 100644 index 0000000000000000000000000000000000000000..d96b8932c3bbfcfe57dac0b5f1567ffc367aa234 GIT binary patch literal 597 zcmV-b0;>IqP)Px%4@pEpRCt{2n=y{VAP_~rSDb*-$`K+O`Y0F31=8efX>yKSz)i#v5G7Y&ixs$!9DE;PBj4`m*&f08V007WhFS@TJVt5gxcA%7D7^>_`qlP1Z+JPFJb47N! zn#Gv65&+0gu2iJR?tcO-0JQ_uumIE!P*c4N)UL8yr&s{3_2Qg-%M=Mvn})sQUUlWvcziu->vqo5Uony>7-)OG`>#jhpqe)Elzr-&h*Fc^?g5CKyBfh zsOhFy!qgCD=H#u`$tj}wAOZM1mqeT*JAfYQ5JyO0cywuNEbmWI0C2! zPImz+NCb!nt&wqh+#0cV-o5nmTeakLt(6~VeCfl`f7#%gh}HuFe_Lnb^|-U76{2+) j$JGCLM%N_kz^?fOP!rW&iN7ow00000NkvXXu0mjf2