From f579818f24c7873f192c277444f1fcd2926a6028 Mon Sep 17 00:00:00 2001 From: AjexRose <112997230+AjexRose@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:41:51 -0500 Subject: [PATCH] Adding Ammofab (#17538) --- .../Circuitboards/Machine/production.yml | 14 ++++++ .../Entities/Structures/Machines/lathe.yml | 41 ++++++++++++++++++ .../Prototypes/Procedural/salvage_rewards.yml | 1 + .../Structures/Machines/techfab.rsi/ammo.png | Bin 0 -> 700 bytes .../Structures/Machines/techfab.rsi/meta.json | 5 ++- 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Machines/techfab.rsi/ammo.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 29324a65b1..993a679aab 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -48,6 +48,20 @@ DefaultPrototype: Beaker ExamineName: Glass Beaker +- type: entity + id: AmmoTechFabCircuitboard + parent: BaseMachineCircuitboard + name: ammo techfab circuit board + description: A machine printed circuit board for an ammo techfab + components: + - type: Sprite + state: security + - type: MachineBoard + prototype: AmmoTechFab + requirements: + MatterBin: 1 + Manipulator: 1 + - type: entity id: MedicalTechFabCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7dae0e0d4a..fba103c5cd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -469,6 +469,47 @@ - RawMaterial - Ingot +- type: entity + id: AmmoTechFab + parent: BaseLathe + name: ammo techfab + description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: ammo + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: AmmoTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + staticRecipes: + - CartridgePistol + - CartridgeMagnum + - ShellShotgun + - ShellShotgunFlare + - ShellTranquilizer + - CartridgeLightRifle + - CartridgeRifle + - MagazineBoxPistol + - MagazineBoxMagnum + - MagazineBoxRifle + - MagazineBoxLightRifle + - type: MaterialStorage + whitelist: + tags: + - Sheet + - type: entity id: MedicalTechFab parent: BaseLathe diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 9060cbe178..92a393a6a7 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -56,6 +56,7 @@ id: SalvageRewardEpic weights: # rare machinery + AmmoTechFabCircuitboard: 1.0 ResearchAndDevelopmentServerMachineCircuitboard: 1.0 CratePartsT4: 1.0 PowerCellAntiqueProto: 0.25 diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/ammo.png b/Resources/Textures/Structures/Machines/techfab.rsi/ammo.png new file mode 100644 index 0000000000000000000000000000000000000000..38f7a4dd2cb919e69d387d37efb188635921a680 GIT binary patch literal 700 zcmV;t0z>_YP)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Qx@<$WWauh+jBL6^me@v=v%)FuC*#ni!H4 z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIN3n$)S(glehxvqHp#<}FOz%xZNo1P;UiKS8pD;>LMR8WPD7_B-f7SgmI_wh$ue~MfRxhi1f zn8yY*$gUs!4}N!R6(`2Mq;MSQesP?SVIZ^%H0zG@ee5{R6Cn5uT)|5Tqat9cEGGtSBr65hASOnhB=$rDuz%9_b>h;#z$LRx*rLLB4fP+I| zq(s?kKJV`7?Csw(t^R%hpFMK95|x%T0002lNkl+k`Of>8$yxC4mJ1tG--R4Itac7TDV94+i8-T{slDkyw%%LTF>&_914HS8nb z0XOd4q=^FtS1yn+VfoK5%uH7YV1xiG2NT2WC{qSj4ki>f0|NuYv>;>JJAi?Kf#K8r zZ*a?Sv1#f6m}S`5)CMSdS;B;c=+f@RnLku12S&jt7zLvM0AhqR`l%_DWB>pF4rN$L iW=%~1DgXcg2mk;800000(o>TF0000