diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs index dba91a3e563..0f1bef40277 100644 --- a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs +++ b/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs @@ -75,7 +75,7 @@ public sealed partial class MailComponent : SharedMailComponent /// The amount that cargo will be awarded for delivering this mail. /// [DataField("bounty")] - public int Bounty = 750; + public int Bounty = 7500; // Frontier 750<7500 /// /// Penalty if the mail is destroyed. diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs index cec1f845121..73cd6d93b4f 100644 --- a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs +++ b/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs @@ -12,10 +12,10 @@ public sealed partial class MailTeleporterComponent : Component // Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart. [DataField("accumulator")] - public float Accumulator = 285f; + public float Accumulator = 1995f; // Frontier 285*7=1995 [DataField("teleportInterval")] - public TimeSpan TeleportInterval = TimeSpan.FromMinutes(5); + public TimeSpan TeleportInterval = TimeSpan.FromMinutes(35); /// /// The sound that's played when new mail arrives. @@ -72,7 +72,7 @@ public sealed partial class MailTeleporterComponent : Component /// What's the bonus for delivering a fragile package intact? /// [DataField("fragileBonus")] - public int FragileBonus = 200; + public int FragileBonus = 2000; // Frontier 200<2000 /// /// What's the malus for failing to deliver a fragile package? @@ -91,13 +91,13 @@ public sealed partial class MailTeleporterComponent : Component /// if not delivered? /// [DataField("priorityDuration")] - public TimeSpan priorityDuration = TimeSpan.FromMinutes(15); + public TimeSpan priorityDuration = TimeSpan.FromMinutes(45); // Frontier 15<45 /// /// What's the bonus for delivering a priority package on time? /// [DataField("priorityBonus")] - public int PriorityBonus = 500; + public int PriorityBonus = 5000; // Frontier 500<5000 /// /// What's the malus for failing to deliver a priority package? diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs index ffb173acdf4..8169e1e06b0 100644 --- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs +++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs @@ -230,8 +230,8 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI return; } - //_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User); - _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income + _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User); + //_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income component.IsProfitable = false; diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4a892324bab..ef40027a6ec 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4829,3 +4829,35 @@ Entries: sprites by Dragonfruits. id: 5013 time: '2024-06-06T00:22:52.0000000+00:00' +- author: Cheackraze + changes: + - type: Tweak + message: Lowered the movement speed and damage of ore crabs and golems + - type: Tweak + message: Increased the ore yield from ore crabs and golems + id: 5014 + time: '2024-06-07T07:50:15.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Private Security Hardsuit. + - type: Add + message: Private security cosmetic options to merc loadout. + id: 5015 + time: '2024-06-07T09:53:14.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: >- + Rubber bullets can be printed in the NFSD techfab with Nonlethal + Ammunition researched. + id: 5016 + time: '2024-06-07T10:58:39.0000000+00:00' +- author: dvir01 + changes: + - type: Tweak + message: >- + Frontier has increased mail related profits, but lowered the amount of + existing mail, expect the mail to find you soon. + id: 5017 + time: '2024-06-07T17:10:14.0000000+00:00' diff --git a/Resources/Locale/en-US/nyanotrasen/mail.ftl b/Resources/Locale/en-US/nyanotrasen/mail.ftl index 36d5ec771d2..99dc2431fdd 100644 --- a/Resources/Locale/en-US/nyanotrasen/mail.ftl +++ b/Resources/Locale/en-US/nyanotrasen/mail.ftl @@ -9,7 +9,7 @@ mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/ mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive. mail-unlocked = Anti-tamper system unlocked. mail-unlocked-by-emag = Anti-tamper system *BZZT*. -mail-unlocked-reward = Anti-tamper system unlocked. +mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to Frontier account. mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS. mail-penalty-fragile = INTEGRITY COMPROMISED. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS. mail-penalty-expired = DELIVERY PAST DUE. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index 4c0b14b113a..d3e5ec484a4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -93,10 +93,10 @@ path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg damage: types: - Blunt: 6 + Blunt: 5 - type: MovementSpeedModifier baseWalkSpeed : 2 - baseSprintSpeed : 2.5 + baseSprintSpeed : 2.25 - type: NpcFactionMember factions: - SimpleHostile diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ad0fa9702d1..39feffaec33 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -370,6 +370,7 @@ - ClothingOuterHardsuitRd # Frontier - ClothingOuterHardsuitLuxury # Frontier - ClothingOuterHardsuitMercenary # Frontier + - ClothingOuterHardsuitPrivateSecurity # Frontier - ClothingOuterHardsuitScaf # Frontier - ClothingOuterHardsuitPilot # Frontier - ClothingOuterHardsuitMaximPrototype # Frontier @@ -802,10 +803,10 @@ - MagazineBoxPistolUranium - MagazineBoxRifleIncendiary - MagazineBoxRifleUranium -# - MagazineBoxLightRifleRubber # Frontier - Restore This Later -# - MagazineBoxMagnumRubber # Frontier - Restore This Later -# - MagazineBoxPistolRubber # Frontier - Restore This Later -# - MagazineBoxRifleRubber # Frontier - Restore This Later + - MagazineBoxLightRifleRubber # Frontier + - MagazineBoxMagnumRubber # Frontier + - MagazineBoxPistolRubber # Frontier + - MagazineBoxRifleRubber # Frontier - MagazineGrenadeEmpty - MagazineLightRifleIncendiary - MagazineLightRifleUranium diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml index b2ed0955602..90b8ee15ff2 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml @@ -5,7 +5,8 @@ name: mail-item-name-unaddressed components: - type: Item - size: Normal +# size: Normal # Frontier + storedRotation: -90 - type: Mail - type: AccessReader - type: Sprite @@ -19,8 +20,8 @@ map: ["enum.MailVisualLayers.FragileStamp"] visible: false - map: ["enum.MailVisualLayers.JobStamp"] - scale: 0.5, 0.5 - offset: 0.275, 0.2 + scale: 0.8, 0.8 # Frontier 0.5<0.8 + offset: 0.225, 0.165 # Frontier (0.275, 0.2)<(0.225, 0.165) - state: locked map: ["enum.MailVisualLayers.Lock"] - state: priority @@ -92,7 +93,7 @@ damage: types: Blunt: 10 - - type: CargoSellBlacklist + - type: CargoSellBlacklist # Frontier - type: Food # Frontier - Moth food requiresSpecialDigestion: true - type: SolutionContainerManager diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 5aed3aa6aaa..0acd9a7d122 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -66,6 +66,10 @@ - ShellTranquilizer - BoxBeanbag - WeaponDisabler + - MagazineBoxLightRifleRubber # Frontier + - MagazineBoxMagnumRubber # Frontier + - MagazineBoxPistolRubber # Frontier + - MagazineBoxRifleRubber # Frontier - type: technology id: UraniumMunitions diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index c3599c4d97c..47ab0cdd1b5 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -56,6 +56,16 @@ category: cargoproduct-category-name-security group: market +- type: cargoProduct + id: CrateVendingMachineRestockNonLethalVend + icon: + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockNonLethalVendFilled + cost: 100 # Frontier + category: cargoproduct-category-name-security + group: market + - type: cargoProduct id: CrateVendingMachineRestockAutoTuneVend abstract: true diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index ef165874ac3..a4972ba8759 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -53,6 +53,17 @@ - id: VendingMachineRestockLessLethalVend amount: 2 +- type: entity + id: CrateVendingMachineRestockNonLethalVendFilled + parent: CratePlasticBiodegradable + name: NonLethalVend restock crate + description: Contains two restock boxes for the NonLethalVend vending machine. + components: + - type: StorageFill + contents: + - id: VendingMachineRestockNonLethalVend + amount: 2 + - type: entity id: CrateVendingMachineRestockAutoTuneVendFilled parent: CratePlasticBiodegradable diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index 8d39c5ced1c..6227635cfe5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -80,6 +80,22 @@ - type: AccessReader access: [["Captain"], ["Mercenary"]] +- type: entity + id: SuitStoragePrivateSecurity + parent: SuitStorageBase + suffix: Private Security + components: + - type: StorageFill + contents: + - id: AirTankFilled + - id: ClothingOuterHardsuitPrivateSecurity + - id: ClothingMaskGasSecurity + - id: JetpackMiniFilled + - id: HandheldGPSBasic +# - id: ClothingShoesBootsMagCombat # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn. + - type: AccessReader + access: [["Captain"], ["Mercenary"]] + #SCAF hardsuit - type: entity id: SuitStorageScaf diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index 9f8ef8fd7a8..06c97b19fa8 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -40,7 +40,7 @@ CrayonRainbow: 5 WeaponWaterPistol: 8 WeaponWaterBlaster: 4 - TargetDarts: 1 + TargetDartsFlatpack: 1 BoxDarts: 2 ChessBoard: 2 BackgammonBoard: 2 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 4bee76153f4..9086abe8c7d 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -6,23 +6,17 @@ WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 - BoxDonkSoftBox: 10 - BoxCartridgeCap: 10 - MagazineBoxPistolRubber: 10 - MagazineBoxMagnumRubber: 10 BoxBeanbag: 8 MagazineBoxRifleRubber: 8 - MagazineBoxLightRifleRubber: 4 - MagazineBoxCaselessRifleRubber: 4 - SpeedLoaderRifleHeavyRubber: 10 + MagazineBoxCaselessRifleRubber: 10 + MagazineBoxLightRifleRubber: 5 + MagazineBoxPistolRubber: 10 + MagazineBoxMagnumRubber: 10 contrabandInventory: + SpeedLoaderRifleHeavyRubber: 3 + SpeedLoaderPistolRubber: 3 + SpeedLoaderMagnumRubber: 3 WeaponRifleBB: 2 BoxCartridgeBB: 10 emaggedInventory: - WeaponLaserCarbinePractice: 4 - WeaponDisablerPractice: 4 - MagazineBoxPistolPractice: 10 - MagazineBoxMagnumPractice: 10 - MagazineBoxLightRiflePractice: 10 - MagazineBoxCaselessRiflePractice: 10 - BoxShotgunPractice: 10 + ThrowingKnife: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml new file mode 100644 index 00000000000..1dbc5afea58 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml @@ -0,0 +1,23 @@ +- type: vendingMachineInventory + id: NonLethalVendInventory + startingInventory: + WeaponDisablerPractice: 4 + WeaponLaserCarbinePractice: 4 + BoxShotgunPractice: 8 + MagazineBoxRiflePractice: 8 + MagazineBoxCaselessRiflePractice: 10 + MagazineBoxLightRiflePractice: 5 + MagazineBoxPistolPractice: 10 + MagazineBoxMagnumPractice: 10 + RevolverCapGun: 2 + BoxCartridgeCap: 4 + FoamCrossbow: 2 + BoxDonkSoftBox: 4 + TargetDartsFlatpack: 2 + BoxDarts: 4 + contrabandInventory: + SpeedLoaderRifleHeavyPractice: 3 + SpeedLoaderPistolPractice: 3 + SpeedLoaderMagnumPractice: 3 + emaggedInventory: + ThrowingKnife: 1 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index 51252fdf9e3..81bd3805725 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -11,6 +11,7 @@ name: mercenary hardsuit helmet description: Lightly armored hardsuit helmet for mercenary needs. components: + - type: BreathMask - type: Sprite sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi - type: Clothing @@ -27,6 +28,19 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + +- type: entity + parent: ClothingHeadHelmetHardsuitMercenary + id: ClothingHeadHelmetHardsuitPrivateSecurity + name: private security hardsuit helmet + description: Lightly armored hardsuit helmet for private security needs. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi + - type: PointLight + color: "#ffff00" #Pilot Hardsuit - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 0fcdf7c486a..d04c362e937 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -29,6 +29,19 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMercenary + +- type: entity + parent: ClothingOuterHardsuitMercenary + id: ClothingOuterHardsuitPrivateSecurity # stats are of merc hardsuit + name: private security hardsuit + description: A special suit that protects from the danger of space, employed by private security forces. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitPrivateSecurity # Pilot Hardsuit - Spationaut stats - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml index 1a5bf8f9c28..f98ce2a9095 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/elemental.yml @@ -8,7 +8,7 @@ sprite: /Textures/_NF/Mobs/Elemental/orecrab.rsi state: bananium_crab - type: RadiationSource - intensity: 2 + intensity: 1 slope: 0.3 - type: Destructible thresholds: @@ -47,8 +47,8 @@ - !type:SpawnEntitiesBehavior spawn: Coal1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -72,8 +72,8 @@ - !type:SpawnEntitiesBehavior spawn: GoldOre1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -101,8 +101,8 @@ - !type:SpawnEntitiesBehavior spawn: PlasmaOre1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] - type: PointLight @@ -156,7 +156,7 @@ sprite: /Textures/_NF/Mobs/Elemental/orecrab.rsi state: bananium_crab - type: RadiationSource - intensity: 2 + intensity: 1 slope: 0.3 - type: Destructible thresholds: @@ -195,8 +195,8 @@ - !type:SpawnEntitiesBehavior spawn: GoldOre1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -224,8 +224,8 @@ - !type:SpawnEntitiesBehavior spawn: PlasmaOre1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] - type: PointLight @@ -277,8 +277,8 @@ - !type:SpawnEntitiesBehavior spawn: SpaceQuartz1: - min: 2 - max: 4 + min: 3 + max: 5 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -304,8 +304,8 @@ - !type:SpawnEntitiesBehavior spawn: SteelOre1: - min: 2 - max: 4 + min: 3 + max: 5 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -315,7 +315,7 @@ description: An ore crab made from uranium. components: - type: RadiationSource - intensity: 2 + intensity: 1 slope: 0.3 - type: Destructible thresholds: @@ -329,8 +329,8 @@ - !type:SpawnEntitiesBehavior spawn: UraniumOre1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] - type: PointLight @@ -357,8 +357,8 @@ - !type:SpawnEntitiesBehavior spawn: SilverOre1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -380,10 +380,10 @@ path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg damage: types: - Blunt: 15 + Blunt: 12 - type: MovementSpeedModifier baseWalkSpeed : 2 - baseSprintSpeed : 2.5 + baseSprintSpeed : 2.25 - type: NpcFactionMember factions: - SimpleHostile @@ -400,7 +400,7 @@ - type: Sprite state: bananium_golem - type: RadiationSource - intensity: 2 + intensity: 1 slope: 0.3 - type: Destructible thresholds: @@ -439,8 +439,8 @@ - !type:SpawnEntitiesBehavior spawn: Coal1: - min: 1 - max: 3 + min: 2 + max: 4 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -464,7 +464,7 @@ spawn: Coal1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -488,7 +488,7 @@ spawn: GoldOre1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -512,7 +512,7 @@ spawn: SteelOre1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -540,7 +540,7 @@ spawn: PlasmaOre1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] - type: PointLight @@ -568,7 +568,7 @@ spawn: SpaceQuartz1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -616,7 +616,7 @@ spawn: SilverOre1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] @@ -628,7 +628,7 @@ - type: Sprite state: uranium_golem - type: RadiationSource - intensity: 2 + intensity: 1 slope: 0.3 - type: Destructible thresholds: @@ -643,6 +643,6 @@ spawn: UraniumOre1: min: 5 - max: 10 + max: 15 - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml new file mode 100644 index 00000000000..4d138b0f55d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml @@ -0,0 +1,13 @@ +- type: entity + name: dartboard + id: TargetDartsFlatpack + parent: BaseNFFlatpack + description: A flatpack used for constructing a dart board. + components: + - type: Flatpack + entity: TargetDarts + - type: Sprite + layers: + - state: service_tray + - type: StaticPrice + price: 40 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index ea1594b4336..8265a9b2935 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -127,6 +127,23 @@ shader: unshaded - state: refill_lesslethal +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockNonLethalVend + name: NonLethalVend restock box + description: A box containing practice bullets for the Non Lethal vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + components: + - type: VendingMachineRestock + canRestock: + - NonLethalVendInventory + - type: Sprite + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_nonlethal + - type: entity parent: SecuredVendingMachineRestock id: VendingMachineRestockAutoTuneVend diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 9c6bb597015..1d4f7bea910 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -235,6 +235,39 @@ energy: 1.6 color: "#ff033e" +- type: entity + parent: VendingMachine + id: NonLethalVendingMachine + name: NonLethalVend + description: Try not to aim for the eyes! + components: + - type: VendingMachine + pack: NonLethalVendInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 3 + - type: Advertise + pack: LessLethalVendAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/nonlethalvend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#ff033e" + - type: entity parent: [BaseStructureUnanchorable, VendingMachine] id: VendingMachineAutoTuneVend diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/head.yml index 288efe2dd0a..2d73fd72ffc 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/head.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/head.yml @@ -312,6 +312,19 @@ id: ContractorClothingHeadHatGreyFlatcap equipment: head: ClothingHeadHatGreyFlatcap + +- type: loadout + id: ContractorClothingHeadHatBrownFlatcap + equipment: ContractorClothingHeadHatBrownFlatcap + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 650 + +- type: startingGear + id: ContractorClothingHeadHatBrownFlatcap + equipment: + head: ClothingHeadHatBrownFlatcap - type: loadout id: ContractorClothingHeadHatCapcap diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/belt.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/belt.yml index 98fd5cfb828..c8b7bf333ec 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/belt.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/belt.yml @@ -17,3 +17,13 @@ id: MercenaryClothingBeltMilitaryWebbing equipment: belt: ClothingBeltMilitaryWebbing + +- type: loadout + id: MercenaryClothingBeltSecurity + equipment: MercenaryClothingBeltSecurity + price: 500 + +- type: startingGear + id: MercenaryClothingBeltSecurity + equipment: + belt: ClothingBeltSecurityFilled diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml index 5b211e26c7e..1ca55cb15e3 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/face.yml @@ -7,3 +7,13 @@ id: MercenaryClothingMaskGasMercenary equipment: mask: ClothingMaskGasMercenary + +- type: loadout + id: MercenaryClothingMaskGasSecurity + equipment: MercenaryClothingMaskGasSecurity + price: 0 + +- type: startingGear + id: MercenaryClothingMaskGasSecurity + equipment: + mask: ClothingMaskGasSecurity \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml index 470163566bc..8b71bb25ddb 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml @@ -18,6 +18,26 @@ equipment: jumpsuit: ClothingUniformJumpskirtMercenary +- type: loadout + id: MercenaryClothingUniformJumpsuitPrivateSec + equipment: MercenaryClothingUniformJumpsuitPrivateSec + price: 0 + +- type: startingGear + id: MercenaryClothingUniformJumpsuitPrivateSec + equipment: + jumpsuit: ClothingUniformJumpsuitPrivateSec + +- type: loadout + id: MercenaryClothingUniformJumpskirtPrivateSec + equipment: MercenaryClothingUniformJumpskirtPrivateSec + price: 0 + +- type: startingGear + id: MercenaryClothingUniformJumpskirtPrivateSec + equipment: + jumpsuit: ClothingUniformJumpskirtPrivateSec + # T3 "Military" - type: loadout id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index 3a96ab9ad84..62023a46800 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -427,6 +427,7 @@ - ContractorClothingHeadHatCasa - ContractorClothingHeadHatBowlerHat - ContractorClothingHeadHatGreyFlatcap + - ContractorClothingHeadHatBrownFlatcap - ContractorClothingHeadHatCapcap - ContractorClothingHeadHatParamedicsoft - ContractorClothingHeadNurseHat diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index d040ad938d7..5e3230d5e88 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -4,6 +4,8 @@ loadouts: #First Section: Role specific freebies/discounts/rewards - MercenaryClothingUniformJumpsuitMercenary - MercenaryClothingUniformJumpskirtMercenary + - MercenaryClothingUniformJumpsuitPrivateSec + - MercenaryClothingUniformJumpskirtPrivateSec - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain @@ -176,6 +178,49 @@ - MercenaryClothingBackpackDuffelMercenary - MercenaryClothingBackpackSatchelMercenary - MercenaryClothingBackpackMessengerMercenary + - SecurityBackpack + - SecuritySatchel + - SecurityDuffel + - ContractorClothingBackpack + - ContractorClothingBackpackDuffel + - ContractorClothingBackpackSatchel + - ContractorClothingBackpackMessenger + - PilotClothingBackpackPilot + - PilotClothingBackpackDuffelPilot + - PilotClothingBackpackSatchelPilot + - PilotClothingBackpackMessengerPilot + - ContractorClothingBackpackCaptain + - ContractorClothingBackpackDuffelCaptain + - ContractorClothingBackpackSatchelCaptain + - ContractorClothingBackpackMessengerCaptain + - ContractorClothingBackpackSalvage + - ContractorClothingBackpackDuffelSalvage + - ContractorClothingBackpackSatchelSalvage + - ContractorClothingBackpackMessengerSalvage + - ContractorClothingBackpackCargo + - ContractorClothingBackpackDuffelCargo + - ContractorClothingBackpackSatchelCargo + - ContractorClothingBackpackMessengerCargo + - ContractorClothingBackpackHydroponics + - ContractorClothingBackpackDuffelHydroponics + - ContractorClothingBackpackSatchelHydroponics + - ContractorClothingBackpackMessengerHydroponics + - ContractorClothingBackpackScience + - ContractorClothingBackpackDuffelScience + - ContractorClothingBackpackSatchelScience + - ContractorClothingBackpackMessengerScience + - ContractorClothingBackpackMedical + - ContractorClothingBackpackDuffelMedical + - ContractorClothingBackpackSatchelMedical + - ContractorClothingBackpackMessengerMedical + - ContractorClothingBackpackChemistry + - ContractorClothingBackpackDuffelChemistry + - ContractorClothingBackpackSatchelChemistry + - ContractorClothingBackpackMessengerChemistry + - MercenaryClothingBackpackMercenary + - MercenaryClothingBackpackDuffelMercenary + - MercenaryClothingBackpackSatchelMercenary + - MercenaryClothingBackpackMessengerMercenary - ContractorClothingBackpack - ContractorClothingBackpackDuffel - ContractorClothingBackpackSatchel @@ -392,6 +437,8 @@ - MercenaryClothingHeadHelmetMercenary - MercenaryClothingHeadBandMercenary - MercenaryClothingHeadHatBeretMercenary + - SecurityHelmet + - SecurityBeret - ContractorClothingHeadHelmetEVALarge - ContractorClothingHeadBandBlack - ContractorClothingHeadBandBlue @@ -421,6 +468,7 @@ - ContractorClothingHeadHatCasa - ContractorClothingHeadHatBowlerHat - ContractorClothingHeadHatGreyFlatcap + - ContractorClothingHeadHatBrownFlatcap - ContractorClothingHeadHatCapcap - ContractorClothingHeadHatParamedicsoft - ContractorClothingHeadNurseHat @@ -555,6 +603,7 @@ minLimit: 0 loadouts: - MercenaryClothingMaskGasMercenary + - MercenaryClothingMaskGasSecurity - ContractorClothingMaskBreath - ContractorClothingMaskBreathMedical - ContractorClothingMaskSterile @@ -575,6 +624,7 @@ loadouts: - MercenaryClothingBeltMercenaryWebbing - MercenaryClothingBeltMilitaryWebbing + - MercenaryClothingBeltSecurity - ContractorClothingBeltPlant - ContractorClothingBeltPlantFilled - ContractorClothingBeltChef diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml index ee1dd11fe91..b41f693b04c 100644 --- a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml @@ -405,6 +405,7 @@ - ContractorClothingHeadHatCasa - ContractorClothingHeadHatBowlerHat - ContractorClothingHeadHatGreyFlatcap + - ContractorClothingHeadHatBrownFlatcap - ContractorClothingHeadHatCapcap - ContractorClothingHeadHatParamedicsoft - ContractorClothingHeadNurseHat diff --git a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml index cfeb7ce786a..15ea524039d 100644 --- a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml @@ -61,6 +61,7 @@ - ContractorClothingHeadHatCasa - ContractorClothingHeadHatBowlerHat - ContractorClothingHeadHatGreyFlatcap + - ContractorClothingHeadHatBrownFlatcap - ContractorClothingHeadHatCapcap - ContractorClothingHeadHatParamedicsoft - ContractorClothingHeadNurseHat diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml index 411650e2f8d..e18dab710dc 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml @@ -262,6 +262,18 @@ Durathread: 2000 Silver: 2000 Gold: 1000 + +- type: latheRecipe + id: ClothingOuterHardsuitPrivateSecurity + result: ClothingOuterHardsuitPrivateSecurity + category: EVASuits + completetime: 4 + materials: + Glass: 500 + Plasteel: 2000 + Durathread: 2000 + Silver: 2000 + Gold: 1000 - type: latheRecipe id: ClothingOuterHardsuitBrigmedic diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index b521e8e0c60..b35556fc5ed 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -39,4 +39,40 @@ completetime: 5 materials: Steel: 50 - Plastic: 150 \ No newline at end of file + Plastic: 150 + +- type: latheRecipe + id: MagazineBoxLightRifleRubber + result: MagazineBoxLightRifleRubber + category: Ammo + completetime: 5 + materials: + Steel: 300 + Plastic: 600 + +- type: latheRecipe + id: MagazineBoxMagnumRubber + result: MagazineBoxMagnumRubber + category: Ammo + completetime: 5 + materials: + Steel: 80 + Plastic: 160 + +- type: latheRecipe + id: MagazineBoxPistolRubber + result: MagazineBoxPistolRubber + category: Ammo + completetime: 5 + materials: + Steel: 200 + Plastic: 400 + +- type: latheRecipe + id: MagazineBoxRifleRubber + result: MagazineBoxRifleRubber + category: Ammo + completetime: 5 + materials: + Steel: 250 + Plastic: 500 diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 8bba5473372..4a99b0f7683 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -12,6 +12,7 @@ recipeUnlocks: - ClothingOuterHardsuitMercenary - ClothingOuterHardsuitPirateEVA + - ClothingOuterHardsuitPrivateSecurity technologyPrerequisites: - AdvancedRiotControl - HardsuitsAdvanced diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png new file mode 100644 index 00000000000..a47ce1f6e67 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png new file mode 100644 index 00000000000..6c0475392ca Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json new file mode 100644 index 00000000000..01db878e895 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, modified and recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..1d1d7023ad4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..7a463a1cc08 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..6acbf4f6a1d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png new file mode 100644 index 00000000000..41f93b1f08b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png new file mode 100644 index 00000000000..b81c4c22265 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png new file mode 100644 index 00000000000..aace4cdcd92 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json new file mode 100644 index 00000000000..015e7809249 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7, modified and recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index a4a1bfdd17f..d3fe3db9937 100644 --- a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. LessLethalVend by @|Data_Redacted| pottedplant by @erhardsteinhauer based on @minnie6969 work", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. LessLethalVend by @|Data_Redacted| pottedplant by @erhardsteinhauer based on @minnie6969 work, NonlethalVend made by Slush modified from the NonLethalVend", "size": { "x": 32, "y": 32 @@ -27,6 +27,9 @@ }, { "name": "refill_nfsdtec" - } + }, + { + "name": "refill_nonlethal" + } ] } diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png new file mode 100644 index 00000000000..1fcf2c6d6e0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png new file mode 100644 index 00000000000..34d717b17ae Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png new file mode 100644 index 00000000000..e88b7af717a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png new file mode 100644 index 00000000000..ab098b08edf Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json new file mode 100644 index 00000000000..30ce8a13dab --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by [Data_Redacted] https://github.com/IData-RedactedI and art edited by Slush [Disord: slush6789]", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.5, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.2, + 0.4, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png new file mode 100644 index 00000000000..1a05c9d528e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png new file mode 100644 index 00000000000..43ecef81185 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png new file mode 100644 index 00000000000..231c1f49d7e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png differ