From 74d4232e244e6af13806f54f05c26c3d201285e3 Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Fri, 7 Jun 2024 03:50:15 -0400 Subject: [PATCH 01/10] mining crab and golem rebalance (#1485) --- .../Entities/Mobs/NPCs/elemental.yml | 4 +- .../_NF/Entities/Mobs/NPCs/elemental.yml | 68 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) 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/_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" ] From d502a41fde9191edff23a3ec59106e89e6ab1de3 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 7 Jun 2024 07:50:39 +0000 Subject: [PATCH 02/10] Automatic Changelog (#1485) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4a892324bab..e76b555bfdc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4829,3 +4829,11 @@ 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' From 280e6be07f2d473f9556b65f43fbd8a2c23cba3c Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Fri, 7 Jun 2024 04:53:14 -0500 Subject: [PATCH 03/10] Private Security Hardsuit and New Merc Loadout Options (#1445) * phase 1 * Suit and extra loadout options for merc * inhand update * Update mercenary_loadout_groups.yml * Update hardsuit-helmets.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Entities/Structures/Machines/lathe.yml | 1 + .../Catalog/Fills/Lockers/suit_storage.yml | 16 ++++++ .../Clothing/Head/hardsuit-helmets.yml | 14 +++++ .../Clothing/OuterClothing/hardsuits.yml | 13 +++++ .../_NF/Loadouts/Jobs/Mercenary/belt.yml | 10 ++++ .../_NF/Loadouts/Jobs/Mercenary/face.yml | 10 ++++ .../_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml | 20 +++++++ .../_NF/Loadouts/mercenary_loadout_groups.yml | 49 ++++++++++++++++++ .../Prototypes/_NF/Recipes/Lathes/eva.yml | 12 +++++ Resources/Prototypes/_NF/Research/arsenal.yml | 1 + .../private_security.rsi/icon-flash.png | Bin 0 -> 3183 bytes .../Hardsuits/private_security.rsi/icon.png | Bin 0 -> 3155 bytes .../Hardsuits/private_security.rsi/meta.json | 25 +++++++++ .../off-equipped-HELMET.png | Bin 0 -> 3557 bytes .../on-equipped-HELMET.png | Bin 0 -> 3615 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 4387 bytes .../Hardsuits/private_security.rsi/icon.png | Bin 0 -> 3405 bytes .../private_security.rsi/inhand-left.png | Bin 0 -> 3512 bytes .../private_security.rsi/inhand-right.png | Bin 0 -> 3568 bytes .../Hardsuits/private_security.rsi/meta.json | 26 ++++++++++ 20 files changed, 197 insertions(+) create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ad0fa9702d1..2b56322f037 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 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/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/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/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index d040ad938d7..64fbb2f38df 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 @@ -555,6 +602,7 @@ minLimit: 0 loadouts: - MercenaryClothingMaskGasMercenary + - MercenaryClothingMaskGasSecurity - ContractorClothingMaskBreath - ContractorClothingMaskBreathMedical - ContractorClothingMaskSterile @@ -575,6 +623,7 @@ loadouts: - MercenaryClothingBeltMercenaryWebbing - MercenaryClothingBeltMilitaryWebbing + - MercenaryClothingBeltSecurity - ContractorClothingBeltPlant - ContractorClothingBeltPlantFilled - ContractorClothingBeltChef 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/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 0000000000000000000000000000000000000000..a47ce1f6e671cf2c3565fa7c73464d819f31881f GIT binary patch literal 3183 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 Vpp26P5NZGb002ovPDHLkV1jDO=v)8* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6c0475392ca6caf8b5fd626be62db9ebaf13a70f GIT binary patch literal 3155 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 L1GP$3+lc=KK{J%A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a463a1cc0875a8f213e433212b31c90b009507f GIT binary patch literal 3615 zcmZXWcQ_UP`^Mh~IX2l69V29K;aKO`GaMmgJ0x2lB0BaeI+WQFW$(z5RW=#N$~;DP z5wfO*{_}Y~|J(_8jCE+Ku2BI1X!Ue8%`RR2KT(ih?lKR*g-fIK z)wK=)fSTz)K|uCvb^xeMJdnscciepfeFEHld|`S>B+S>}$IauRD*(Z>ICC`0e3Mn> zXyE{15RZ9j;A6%@0W(7+VVJQ3!aS4=`tdyZGc2azH0&HILut4�LJ7R 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 U{F?!Sv*2>{w2U>Y5Dt<52Q{{@$N&HU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6acbf4f6a1d9b51f3d00723cbb74474369382064 GIT binary patch literal 4387 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
  • 6djpPSCNCq; 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 a!w7*`81>B^hUIH;KkCXlN_7z1*Z%`9po=a5 literal 0 HcmV?d00001 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 + } + ] +} From 7ed77cdba11e691063e4db6f6b88883397c0bdba Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 7 Jun 2024 09:53:41 +0000 Subject: [PATCH 04/10] Automatic Changelog (#1445) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e76b555bfdc..c5781062e30 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4837,3 +4837,11 @@ Entries: 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' From 4ebccb13dd3f7a22f94cdac47a85a9e43e752aa8 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 7 Jun 2024 06:58:39 -0400 Subject: [PATCH 05/10] Restore rubber rounds to nfsd techfab, r&d server (#1474) --- .../Entities/Structures/Machines/lathe.yml | 8 ++-- Resources/Prototypes/Research/arsenal.yml | 4 ++ .../_NF/Recipes/Lathes/security.yml | 38 ++++++++++++++++++- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2b56322f037..39feffaec33 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -803,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/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/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 From c8eee327f69abf8351cfb08a49ebf6d4770360fb Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 7 Jun 2024 10:59:04 +0000 Subject: [PATCH 06/10] Automatic Changelog (#1474) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c5781062e30..3f7b1f0de22 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4845,3 +4845,11 @@ Entries: 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' From 2eb75fe1bc743e509bbb22adf04b47b212703e05 Mon Sep 17 00:00:00 2001 From: SirMcSlushers <74610984+SirMcSlushers@users.noreply.github.com> Date: Fri, 7 Jun 2024 10:59:47 -0400 Subject: [PATCH 07/10] Nonlethal Vending Machine (Practice Rounds & Etc) (#1352) * Nonlethal Vending Machine (Practice Rounds & Etc) * Updated * Updated * Added the Restocking * Update meta.json * Cleanup * Update eject-unshaded.png * Fixup --------- Co-authored-by: Dvir --- .../_NF/Catalog/Cargo/cargo_vending.yml | 10 ++++ .../_NF/Catalog/Fills/Crates/vending.yml | 11 +++++ .../Inventories/cuddlycritter.yml | 2 +- .../Inventories/lesslethalvend.yml | 22 ++++----- .../Inventories/nonlethalvend.yml | 23 +++++++++ .../_NF/Entities/Objects/Fun/darts.yml | 13 ++++++ .../Service/vending_machine_restock.yml | 17 +++++++ .../Structures/Machines/vending_machines.yml | 33 +++++++++++++ .../vending_machine_restock.rsi/meta.json | 7 ++- .../refill_nonlethal.png | Bin 0 -> 793 bytes .../nonlethalvend.rsi/broken.png | Bin 0 -> 1660 bytes .../nonlethalvend.rsi/deny-unshaded.png | Bin 0 -> 990 bytes .../nonlethalvend.rsi/eject-unshaded.png | Bin 0 -> 1072 bytes .../nonlethalvend.rsi/meta.json | 44 ++++++++++++++++++ .../nonlethalvend.rsi/normal-unshaded.png | Bin 0 -> 886 bytes .../VendingMachines/nonlethalvend.rsi/off.png | Bin 0 -> 1213 bytes .../nonlethalvend.rsi/panel.png | Bin 0 -> 255 bytes 17 files changed, 165 insertions(+), 17 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png 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/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/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/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 0000000000000000000000000000000000000000..1fcf2c6d6e0bfb657a50097b623660dd163ab489 GIT binary patch literal 793 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 M07*qoM6N<$g6Qm~=l}o! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ab098b08edfb9d50611f003dabd573d635fc006b GIT binary patch literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Wn z&^SMJqOHf_0FhSz;H8U1*}FR|Qdanhxwsx#>9UbS%qx0fDEs8;|2TZ5CW(lW&OV^22-{#)&%J(wwcJm8lsV<9@4RpAiYb-hW zh)c036(n~gU2RAedkZu?s5U%v94k`4F&)p4fjh6mJz+-D}f2kM6Hm zf9SdBIa`BTO@BSn=Xv(!smS$AUgb8|BNH1qSVeOdut*EuDh<+6c^Q-SSia~lXOZTU zTMWv_ZBAWK*j@L*{)cU}w!P&;RaVsnpN|&WxiuWn3s`S;?)%2aSNs|N8y74!|NB(R z;In7d)|IXO4f}E*JleHVv--eOK7$`ACzieOs*7^6%(}w^585lM( z{6DvbVQuWe!}&MXwln;{!7zd0@`@e?4@b*+^X5f5ibOezBqk)dxw#38iU4hknjRqm zq?Aj7{DS`z1Pp1K&C`I&ISV`@iy0XBj({-ZRBb+KU{YG+>Eaj?;r{kIw?C7i0Lz1{ zhYi1+j(&f<=Py?EHm5M6khYPr`=UP_q;=L>fAGNye8eLn_ulSIhG%B?X&}juW-}%)9(r& znCiWKs?F&+7djKRy&R)P7rez;47kK(>&?+Cti`oQelJIZTh ze)#LYO?Bv&pWh)VHRZ#<6ut>@x@aJEn3@&$pEWFB^|^Xy`#0p)fZ zPB=XMc|b{g=ck&4iHwi`)u~^NzS7X-KC5!?p?KXUH zcneg|JoPzqH%|uZb7pS-2cHB}q@4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2 z6c%`NW zw!wLyIK+ywN_SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!) zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG! zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5 z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY4#WTe4#WYKD-Ig~00EXs zL_t(oM`IWTqhJ(_f`JB%P#PytF|zs(WfBeUoIA!SKk3ka&g*L#ZcLwu*A9XXFm`Y! z*#Tz{>?CL|3@|}yih!63@fC->}&-Es4N4+`Hp8`F=PNr z0~(q61VezRMEK|3GX@6-2Zke;Zh^&Y^wi*N5Mc5>#_($)#6c`VQs6`g<`4mh3IULz z_yDryFp$41u%GJ#b!GS06+Cei1K$!#qQE6a7 zDkRID4cP&v`3oTQ8E96lKLFv+&Ov0&wXp~PAI`r)(D4Kv@bS}UhFgyy^nVvdFum^y zgue|ce~;k`MBM`j9|VFI+cVlu)F2oVM1{cYU6x?_{1q_8Fpq0Kn0`5L9+>8vcN$E8 z6N2zTfY_3dpbN>(1(A*-|3QW?+y4fy9RwXf>qIyTM!_f;>41R&0EXSI`rt9_2LJ#7 M07*qoM6N<$f+b6O!~g&Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..43ecef8118568f654cb5260ee14ce69a98a70753 GIT binary patch literal 1213 zcmV;u1Va0XP)4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2 z6c%`NW zw!wLyIK+ywN_SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!) zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG! zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5 z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY4#WTe4#WYKD-Ig~00P}f zL_t(oN5z-TZxT@y#cwGs39T)*&;|$zx~P(9v0-J1v69AZSs0g%8&|q;r#r1H|A!`6 zx31{M*v3>6O=_cvB~>VkN<@g%NcpIQLIQH%Twn$UW~PkkFL}9V?o7Cc11~c(03s|c zE!Fb*Jk#lPnpI?adYY8-em0whKp@aDZ;+}0tycTQ>2yN1T7}8UNjN?}hT-91D3{A% zG#Wvt(<$nk&1NW-N)U}kmuW;34b={k$s{QNi^W0;AeBmyQr;J%s{y2+Vf;S-%d{hE zz-F_NQqM#pksu|cYXVlQm6UoW#1P#DUaz-ix7(TK$HzCNw7=A2jH;NSql;jnT8XKgdomCs=! z26wLgWqS49NKXSjw;?hMEVWc4n$<$||fvpW8OtDk5qJ`QllEB9MlQ?&%}Umg3w)!M=U ztD8T$<5zTkA9lIx;;miNoVXEp8fu{!4a$ZBzdJ4V_Q=*EA$ z8Qr|ZefWCa^r_s8HtK_MxD=8J==FN)o{VC#c(UgKgTVk_Bj1>Tg&Q77@}BeLV68t3 zzInTOG6OD`tESOtU_bs{U|?}^k*?^?+S;1HzLW06r&1A`y88@F&36tVRO;&`1DZ*JS?$n84`hC>^Q8(b19o1keCURS`3A b$^iTWmz1sx7l^eE00000NkvXXu0mjfCX6n{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..231c1f49d7e7b8f122287c949bb59ad4158f6be9 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5aEhmkV@QO1vIOhm1d*PmKm#tfgBlP{#Q~0` zE4kGC=l%Kr>FMbJIp*eN%ha3`6BWaD&sbm*%6Q_F!2Y{DzrVd@zI=UseEX>crdbvY zEStDy9NZFJ%R1v2YsRyNOyPe`FJpUUc{ZPuYQA}c!B=L%>eZ(U_Q!P`JbAJ+@vK_- t3JuwVKFN>&2Ru8_==hN1P(vdlL&qD1PwY2c&H&xV;OXk;vd$@?2>|MaU3dTh literal 0 HcmV?d00001 From 7e0de7c6fc7fb292742e3bcb50b18b50e98318e9 Mon Sep 17 00:00:00 2001 From: Hamblinius Date: Fri, 7 Jun 2024 16:35:20 +0100 Subject: [PATCH 08/10] Brown Flat Cap in Loadouts (#1483) * Brown Flat Cap in Loadouts ## About the PR This PR adds the brown flat cap to the loadouts for the contractor, pilot, and mercenary. ## Why / Balance The grey flat cap is available in the loadouts but the brown one was conspicuously absent (and I need a cool hat that matches my outfit). ## Media ![](https://files.catbox.moe/unsvyu.png) ![](https://files.catbox.moe/vi8osp.png) * Update stationrep_loadout_groups.yml --------- Co-authored-by: Dvir --- .../_NF/Loadouts/Jobs/Contractor/head.yml | 13 +++++++++++++ .../_NF/Loadouts/contractor_loadout_groups.yml | 1 + .../_NF/Loadouts/mercenary_loadout_groups.yml | 1 + .../_NF/Loadouts/pilot_loadout_groups.yml | 1 + .../_NF/Loadouts/stationrep_loadout_groups.yml | 1 + 5 files changed, 17 insertions(+) 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/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 64fbb2f38df..5e3230d5e88 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -468,6 +468,7 @@ - ContractorClothingHeadHatCasa - ContractorClothingHeadHatBowlerHat - ContractorClothingHeadHatGreyFlatcap + - ContractorClothingHeadHatBrownFlatcap - ContractorClothingHeadHatCapcap - ContractorClothingHeadHatParamedicsoft - ContractorClothingHeadNurseHat 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 From 53dd0316c87bb72ce2c8de5133f4248cc6e385e5 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:10:14 +0300 Subject: [PATCH 09/10] Mail Buff (#1473) * MailUp * Update base_mail.yml * Update base_mail.yml * Update MailTeleporterComponent.cs * Update MailComponent.cs * Update base_mail.yml * Update base_mail.yml * Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml Sure Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Nyanotrasen/Mail/Components/MailComponent.cs | 2 +- .../Mail/Components/MailTeleporterComponent.cs | 10 +++++----- Content.Server/Nyanotrasen/Mail/MailSystem.cs | 4 ++-- Resources/Locale/en-US/nyanotrasen/mail.ftl | 2 +- .../Entities/Objects/Specific/Mail/base_mail.yml | 9 +++++---- 5 files changed, 14 insertions(+), 13 deletions(-) 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/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/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 From de8a049bc95b858be7ed4cbd42027501776c4731 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 7 Jun 2024 17:10:44 +0000 Subject: [PATCH 10/10] Automatic Changelog (#1473) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3f7b1f0de22..ef40027a6ec 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4853,3 +4853,11 @@ Entries: 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'