diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index dacc479035e..546de8ae47c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -44,7 +44,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: StaticPrice # Frontier - price: 200 # Frontier + price: 400 # Frontier - type: entity parent: BaseVendingMachineRestock diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml index 0f7e465567c..fac0f214f3b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml @@ -1,7 +1,7 @@ # Registered (legal) weapon crates - type: entity id: CrateArmoryRifleGestio - parent: CrateWeaponSecure + parent: CrateFirearmsSecure name: gestio rifle crate description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open. components: @@ -15,7 +15,7 @@ # Contraband (unregistered) weaponry crates for expeditions - type: entity id: CrateArmorySMGExpedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: SMG crate description: Contains two high-powered, SMGs with four mags. Requires Armory access to open. Unregistered. noSpawn: true @@ -29,7 +29,7 @@ - type: entity id: CrateArmoryShotgunExpedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: shotgun crate description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. Unregistered. noSpawn: true @@ -43,7 +43,7 @@ - type: entity id: CrateArmoryLaserExpedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: lasers crate description: Contains three standard-issue laser carbines. Requires Armory access to open. Unregistered. noSpawn: true @@ -55,7 +55,7 @@ - type: entity id: CrateArmoryEnergyGunExpedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: energy guns crate description: Contains three energy guns. Requires Armory access to open. Unregistered. noSpawn: true @@ -67,7 +67,7 @@ - type: entity id: CrateArmoryPistolsExpedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. Unregistered. noSpawn: true @@ -81,7 +81,7 @@ - type: entity id: CrateArmoryRifleGestioExpedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: gestio rifle crate description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open. Unregistered. noSpawn: true @@ -95,7 +95,7 @@ - type: entity id: CrateArmoryRifleNovaliteC1Expedition - parent: [ CrateWeaponSecure, UnregisteredFirearmBase ] + parent: [ CrateFirearmsSecure, UnregisteredFirearmBase ] name: novalite rifle crate description: Contains two civilian grade rifles with six low capacity clips. Requires Armory access to open. Unregistered. noSpawn: true @@ -106,3 +106,262 @@ amount: 2 - id: MagazineNovaliteC1 amount: 6 + +# Ammo crates +## .20 rifle +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxLethal20 + id: CrateAmmoBoxLethal20 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxBigLethal20 + id: CrateAmmoBoxBigLethal20 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxRubber20 + id: CrateAmmoBoxRubber20 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxBigRubber20 + id: CrateAmmoBoxBigRubber20 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxPractice20 + id: CrateAmmoBoxPractice20 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxIncendiary20 + id: CrateAmmoBoxIncendiary20 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxUranium20 + id: CrateAmmoBoxUranium20 + noSpawn: true + +## .30 rifle +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxLethal30 + id: CrateAmmoBoxLethal30 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxBigLethal30 + id: CrateAmmoBoxBigLethal30 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxRubber30 + id: CrateAmmoBoxRubber30 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxPractice30 + id: CrateAmmoBoxPractice30 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxIncendiary30 + id: CrateAmmoBoxIncendiary30 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxUranium30 + id: CrateAmmoBoxUranium30 + noSpawn: true + +## .35 pistol +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxLethal35 + id: CrateAmmoBoxLethal35 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxRubber35 + id: CrateAmmoBoxRubber35 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxPractice35 + id: CrateAmmoBoxPractice35 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxIncendiary35 + id: CrateAmmoBoxIncendiary35 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxUranium35 + id: CrateAmmoBoxUranium35 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxEmp35 + id: CrateAmmoBoxEmp35 + noSpawn: true + +## .25 caseless +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxLethal25 + id: CrateAmmoBoxLethal25 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxBigLethal25 + id: CrateAmmoBoxBigLethal25 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxRubber25 + id: CrateAmmoBoxRubber25 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxBigRubber25 + id: CrateAmmoBoxBigRubber25 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxPractice25 + id: CrateAmmoBoxPractice25 + noSpawn: true + +## Shotgun +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxLethalShotgun + id: CrateAmmoBoxLethalShotgun + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxRubberShotgun + id: CrateAmmoBoxRubberShotgun + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxPracticeShotgun + id: CrateAmmoBoxPracticeShotgun + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxIncendiaryShotgun + id: CrateAmmoBoxIncendiaryShotgun + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxUraniumShotgun + id: CrateAmmoBoxUraniumShotgun + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxSlugShotgun + id: CrateAmmoBoxSlugShotgun + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxFlareShotgun + id: CrateAmmoBoxFlareShotgun + noSpawn: true + +## .45 ammo +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxLethal45 + id: CrateAmmoBoxLethal45 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxRubber45 + id: CrateAmmoBoxRubber45 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxPractice45 + id: CrateAmmoBoxPractice45 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxIncendiary45 + id: CrateAmmoBoxIncendiary45 + noSpawn: true + +- type: entity + parent: + - CrateAmmoSecureMercenary + - StorageFillAmmoBoxUranium45 + id: CrateAmmoBoxUranium45 + noSpawn: true diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml index 2e870130b95..a0435763c44 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/expeditions_loot.yml @@ -3,18 +3,29 @@ parent: CrateEngineering id: CrateEngineeringKitRtg name: RTG toolkit - description: Contains a full kit to build RTG power plant. + description: Contains a full kit to build an RTG power plant. components: - type: StorageFill contents: + # Expected value: 2.8 + - id: GeneratorRTGFlatpack + amount: 2 + orGroup: rtg + prob: 0.4 + - id: GeneratorRTGFlatpack + amount: 3 + orGroup: rtg + prob: 0.4 - id: GeneratorRTGFlatpack amount: 4 + orGroup: rtg + prob: 0.2 - type: entity parent: CrateEngineering id: CrateEngineeringKitFabrication name: fabrication kit - description: Contains a full kit to build engineering fabrication facility. + description: Contains a full kit to build an engineering fabrication facility. components: - type: StorageFill contents: @@ -43,6 +54,94 @@ - id: ShipyardRCDAmmo amount: 4 +- type: entity + parent: CrateEngineering + id: CrateEngineerHardsuit + name: station engineer's hardsuit crate + description: Contains a station engineer hardsuit. + components: + - type: StorageFill + contents: + - id: AirTankFilled + - id: ClothingShoesBootsMag + - id: ClothingOuterHardsuitEngineering + - id: ClothingMaskBreath + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateEngineering + id: CrateAtmosTechHardsuit + name: atmospheric technician's hardsuit crate + description: Contains a atmospheric technician hardsuit. + components: + - type: StorageFill + contents: + - id: AirTankFilled + - id: ClothingShoesBootsMag + - id: ClothingOuterHardsuitAtmos + - id: ClothingMaskBreath + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateEngineering + id: CrateEngineerChiefHardsuit + name: chief engineer's hardsuit crate + description: Contains a chief engineer hardsuit. + components: + - type: StorageFill + contents: + - id: AirTankFilled + - id: ClothingShoesBootsMag + - id: ClothingOuterHardsuitEngineeringWhite + - id: ClothingMaskBreath + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateEngineering + id: CrateTools + name: tools crate + description: Contains essential tools for engineering. + components: + - type: StorageFill + contents: + - id: ClothingOuterVestHazard + prob: 0.4 + - id: FlashlightLantern + prob: 0.7 + - id: Screwdriver + prob: 0.7 + - id: Wrench + prob: 0.7 + - id: Welder + prob: 0.7 + - id: Crowbar + prob: 0.7 + - id: Wirecutter + prob: 0.7 + - id: Multitool + prob: 0.2 + - id: trayScanner + prob: 0.7 + - id: GasAnalyzer + prob: 0.7 + - id: ClothingBeltUtility + prob: 0.2 + - id: ClothingHandsGlovesColorYellow + prob: 0.05 + - id: ClothingHeadHatHardhatRed + prob: 0.4 + - id: CableApcStack + prob: 0.3 + - id: CableApcStack + prob: 0.3 + - id: CableApcStack + prob: 0.3 + - id: SprayPainter + prob: 0.7 + # Science # Service @@ -64,6 +163,24 @@ - id: VendingMachineRestockChefvend - id: VendingMachineRestockDinnerware +- type: entity + parent: CratePlastic + id: CrateServiceKitCleanades + name: cleanade crate + description: Contains a full kit to clean up a warzone. + components: + - type: StorageFill + contents: + - id: CleanerGrenade + amount: 2 + orGroup: cleanades + - id: CleanerGrenade + amount: 4 + orGroup: cleanades + - id: CleanerGrenade + amount: 6 + orGroup: cleanades + - type: entity parent: CrateHydroponics id: CrateServiceKitHydroponics @@ -126,3 +243,169 @@ - id: KitchenReagentGrinderFlatpack - id: VendingMachineChemicalsFlatpack - id: VendingMachineRestockChemVend + +- type: entity + parent: CrateChemistrySecure + id: CrateChemistrySecureKitChemist + name: chemistry kit + description: Contains a chemist equipment kit. + components: + - type: StorageFill + contents: + - id: BoxSyringe + - id: BoxBeaker + amount: 2 + - id: BoxPillCanister + - id: BoxBottle + - id: BoxVial + - id: ChemBag + - id: ClothingHandsGlovesLatex + - id: ClothingMaskSterile + - id: ClothingEyesGlassesChemical + +- type: entity + parent: CrateMedicalSecure + id: CrateMedicalSecureDoctor + name: doctor chest + description: Contains a doctor equipment kit. + components: + - type: StorageFill + contents: + - id: HandheldHealthAnalyzer + - id: ClothingHandsGlovesLatex + - id: ClothingEyesHudMedical + - id: ClothingMaskSterile + - id: ClothingBeltMedicalFilled + +- type: entity + parent: CrateSurgery + id: CrateMedicalSecureMedicine + name: medicine chest + description: Contains essential medical supplies. + components: + - type: StorageFill + contents: + - id: BoxSyringe + - id: EpinephrineChemistryBottle + amount: 1 + - id: Brutepack + amount: 2 + - id: Ointment + amount: 2 + - id: Bloodpack + amount: 2 + - id: Gauze + +- type: entity + parent: CrateSurgery + id: CrateMedicalSecureMedicinePierce + name: medicine chest + description: Contains essential medical supplies. + components: + - type: StorageFill + contents: + - id: BoxSyringe + - id: EpinephrineChemistryBottle + amount: 1 + - id: Bloodpack + amount: 3 + - id: Gauze + amount: 3 + +- type: entity + parent: CrateMedical + id: CrateMedicalRollerBeds + name: roller bed chest + description: Contains four roller beds. + components: + - type: StorageFill + contents: + - id: RollerBedSpawnFolded + amount: 4 + +- type: entity + parent: CrateEvaKit + id: CrateEvaKitParamedic + name: paramedic voidsuit kit + description: Contains a full paramedic voidsuit kit. + components: + - type: StorageFill + contents: + - id: AirTankFilled + - id: ClothingOuterHardsuitVoidParamed + - id: ClothingMaskBreathMedical + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateEvaKit + id: CrateEvaKitCmo + name: chief medical officer hardsuit kit + description: Contains a full chief medical officer hardsuit kit. + components: + - type: StorageFill + contents: + - id: AirTankFilled + - id: ClothingOuterHardsuitMedical + - id: ClothingMaskBreathMedical + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +# Mercenary +- type: entity + parent: CrateSecureMercenary + id: CrateSecureMercenaryHardsuitMagBoots + name: mercenary hardsuit crate + description: Contains a mercenary hardsuit. + components: + - type: StorageFill + contents: + - id: DoubleEmergencyAirTankFilled + - id: ClothingShoesBootsMagMercenary + - id: ClothingOuterHardsuitMercenary + - id: ClothingMaskGasMercenary + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateSecureMercenaryPrivateSec + id: CrateSecureMercenaryPrivateSecHardsuitMagBoots + name: private security hardsuit crate + description: Contains a private security hardsuit. + components: + - type: StorageFill + contents: + - id: DoubleEmergencyAirTankFilled + - id: ClothingShoesBootsMagCombat + - id: ClothingOuterHardsuitPrivateSecurity + - id: ClothingMaskGasSecurity + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateSecureMercenary + id: CrateSecureMercenaryHardsuit + name: mercenary hardsuit crate + description: Contains a mercenary hardsuit. + components: + - type: StorageFill + contents: + - id: DoubleEmergencyAirTankFilled + - id: ClothingOuterHardsuitMercenary + - id: ClothingMaskGasMercenary + - id: JetpackMiniFilled + - id: HandheldGPSBasic + +- type: entity + parent: CrateSecureMercenaryPrivateSec + id: CrateSecureMercenaryPrivateSecHardsuit + name: private security hardsuit crate + description: Contains a private security hardsuit. + components: + - type: StorageFill + contents: + - id: DoubleEmergencyAirTankFilled + - id: ClothingOuterHardsuitPrivateSecurity + - id: ClothingMaskGasSecurity + - id: JetpackMiniFilled + - id: HandheldGPSBasic diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml index b7d04083d79..9d16c9afbde 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml @@ -11,3 +11,25 @@ - id: SheetSteel - id: SheetPlasma - id: SheetPlasteel + +- type: entity + id: CrateMaterialMetalRods + parent: CrateGenericSteel + name: metal rods crate + description: 90 metal rods, packed with reckless abandon. + components: + - type: StorageFill + contents: + - id: PartRodMetal + amount: 3 + +- type: entity + id: CrateMaterialBiomass + parent: CrateFreezer + name: biomass crate + description: 300 units of biomass. Yum. + components: + - type: StorageFill + contents: + - id: MaterialBiomass + amount: 3 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index 6c5ff2f1a43..2acf0058ea7 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -11,7 +11,7 @@ - type: entity id: CrateVendingMachineRestockAmmoFilled - parent: CratePlasticBiodegradable + parent: CrateAmmoGeneric name: Liberation restock crate description: Contains two restock boxes for the Liberation vending machine. components: @@ -44,7 +44,7 @@ - type: entity id: CrateVendingMachineRestockLessLethalVendFilled - parent: CratePlasticBiodegradable + parent: CrateAmmoGeneric name: LessLethalVend restock crate description: Contains two restock boxes for the LessLethalVend vending machine. components: @@ -55,7 +55,7 @@ - type: entity id: CrateVendingMachineRestockNonLethalVendFilled - parent: CratePlasticBiodegradable + parent: CrateAmmoGeneric name: NonLethalVend restock crate description: Contains two restock boxes for the NonLethalVend vending machine. components: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index d3c80ad32e0..d1c2b2c8d67 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -573,7 +573,7 @@ # Explosives - type: entity - parent: WeaponCaseShort + parent: WeaponCaseShortExplosives id: WeaponCaseShortFireBomb suffix: Dungeon, Fire Bomb noSpawn: true @@ -584,7 +584,7 @@ amount: 4 - type: entity - parent: WeaponCaseShort + parent: WeaponCaseShortExplosives id: WeaponCaseShortPipeBomb suffix: Dungeon, Pipe Bomb noSpawn: true @@ -595,7 +595,7 @@ amount: 4 - type: entity - parent: WeaponCaseShort + parent: WeaponCaseShortExplosives id: WeaponCaseShortSeismicCharge suffix: Dungeon, Seismic Charge noSpawn: true @@ -606,7 +606,7 @@ amount: 4 - type: entity - parent: WeaponCaseShort + parent: WeaponCaseShortExplosives id: WeaponCaseShortExGrenade suffix: Dungeon, Explosive Grenade noSpawn: true @@ -617,7 +617,7 @@ amount: 4 - type: entity - parent: WeaponCaseShort + parent: WeaponCaseShortExplosives id: WeaponCaseShortC4 suffix: Dungeon, C4 noSpawn: true @@ -640,3 +640,262 @@ amount: 1 - id: MagazineAsmgtUniversalPistol amount: 4 + +# Ammo +## .20 rifle +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxLethal20 + id: WeaponCaseShortAmmoBoxLethal20 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxBigLethal20 + id: WeaponCaseShortAmmoBoxBigLethal20 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxRubber20 + id: WeaponCaseShortAmmoBoxRubber20 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxBigRubber20 + id: WeaponCaseShortAmmoBoxBigRubber20 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxPractice20 + id: WeaponCaseShortAmmoBoxPractice20 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxIncendiary20 + id: WeaponCaseShortAmmoBoxIncendiary20 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxUranium20 + id: WeaponCaseShortAmmoBoxUranium20 + noSpawn: true + +## .30 rifle +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxLethal30 + id: WeaponCaseShortAmmoBoxLethal30 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxBigLethal30 + id: WeaponCaseShortAmmoBoxBigLethal30 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxRubber30 + id: WeaponCaseShortAmmoBoxRubber30 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxPractice30 + id: WeaponCaseShortAmmoBoxPractice30 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxIncendiary30 + id: WeaponCaseShortAmmoBoxIncendiary30 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxUranium30 + id: WeaponCaseShortAmmoBoxUranium30 + noSpawn: true + +## .35 pistol +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxLethal35 + id: WeaponCaseShortAmmoBoxLethal35 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxRubber35 + id: WeaponCaseShortAmmoBoxRubber35 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxPractice35 + id: WeaponCaseShortAmmoBoxPractice35 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxIncendiary35 + id: WeaponCaseShortAmmoBoxIncendiary35 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxUranium35 + id: WeaponCaseShortAmmoBoxUranium35 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxEmp35 + id: WeaponCaseShortAmmoBoxEmp35 + noSpawn: true + +## .25 caseless +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxLethal25 + id: WeaponCaseShortAmmoBoxLethal25 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxBigLethal25 + id: WeaponCaseShortAmmoBoxBigLethal25 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxRubber25 + id: WeaponCaseShortAmmoBoxRubber25 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxBigRubber25 + id: WeaponCaseShortAmmoBoxBigRubber25 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxPractice25 + id: WeaponCaseShortAmmoBoxPractice25 + noSpawn: true + +## Shotgun +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxLethalShotgun + id: WeaponCaseShortAmmoBoxLethalShotgun + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxRubberShotgun + id: WeaponCaseShortAmmoBoxRubberShotgun + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxPracticeShotgun + id: WeaponCaseShortAmmoBoxPracticeShotgun + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxIncendiaryShotgun + id: WeaponCaseShortAmmoBoxIncendiaryShotgun + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxUraniumShotgun + id: WeaponCaseShortAmmoBoxUraniumShotgun + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxSlugShotgun + id: WeaponCaseShortAmmoBoxSlugShotgun + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxFlareShotgun + id: WeaponCaseShortAmmoBoxFlareShotgun + noSpawn: true + +## .45 ammo +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxLethal45 + id: WeaponCaseShortAmmoBoxLethal45 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxRubber45 + id: WeaponCaseShortAmmoBoxRubber45 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxPractice45 + id: WeaponCaseShortAmmoBoxPractice45 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxIncendiary45 + id: WeaponCaseShortAmmoBoxIncendiary45 + noSpawn: true + +- type: entity + parent: + - WeaponCaseShortAmmo + - StorageFillAmmoBoxUranium45 + id: WeaponCaseShortAmmoBoxUranium45 + noSpawn: true diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml new file mode 100644 index 00000000000..1521d4a5db0 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/ammo.yml @@ -0,0 +1,365 @@ +# .20 rifle ammo +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxLethal20 + suffix: .20 rifle, Lethal, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRifle + amount: 4 + +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxBigLethal20 + suffix: .20 rifle, Lethal, x4 big boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxRubber20 + suffix: .20 rifle, Rubber, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleRubber + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxBigRubber20 + suffix: .20 rifle, Rubber, x4 big boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBigRubber + amount: 4 + +- type: entity # Practice + abstract: true + id: StorageFillAmmoBoxPractice20 + suffix: .20 rifle, Practice, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRiflePractice + amount: 4 + +- type: entity # Incendiary + abstract: true + id: StorageFillAmmoBoxIncendiary20 + suffix: .20 rifle, Incendiary, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleIncendiary + amount: 4 + +- type: entity # Uranium + abstract: true + id: StorageFillAmmoBoxUranium20 + suffix: .20 rifle, Uranium, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleUranium + amount: 4 + +# .30 rifle ammo +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxLethal30 + suffix: .30 rifle, Lethal, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifle + amount: 4 + +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxBigLethal30 + suffix: .30 rifle, Lethal, x4 big boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxRubber30 + suffix: .30 rifle, Rubber, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleRubber + amount: 4 + +- type: entity # Practice + abstract: true + id: StorageFillAmmoBoxPractice30 + suffix: .30 rifle, Practice, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRiflePractice + amount: 4 + +- type: entity # Incendiary + abstract: true + id: StorageFillAmmoBoxIncendiary30 + suffix: .30 rifle, Incendiary, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleIncendiary + amount: 4 + +- type: entity # Uranium + abstract: true + id: StorageFillAmmoBoxUranium30 + suffix: .30 rifle, Uranium, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleUranium + amount: 4 + +# .35 pistol ammo +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxLethal35 + suffix: .35 pistol, Lethal, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistol + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxRubber35 + suffix: .35 pistol, Rubber, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolRubber + amount: 4 + +- type: entity # Practice + abstract: true + id: StorageFillAmmoBoxPractice35 + suffix: .35 pistol, Practice, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolPractice + amount: 4 + +- type: entity # Incendiary + abstract: true + id: StorageFillAmmoBoxIncendiary35 + suffix: .35 pistol, Incendiary, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolIncendiary + amount: 4 + +- type: entity # Uranium + abstract: true + id: StorageFillAmmoBoxUranium35 + suffix: .35 pistol, Uranium, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolUranium + amount: 4 + +- type: entity # EMP + abstract: true + id: StorageFillAmmoBoxEmp35 + suffix: .35 pistol, EMP, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolEmp + amount: 4 + +# .25 caseless ammo +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxLethal25 + suffix: .25 caseless, Lethal, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxCaselessRifle + amount: 4 + +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxBigLethal25 + suffix: .25 caseless, Lethal, x4 big boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxCaselessRifleBig + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxRubber25 + suffix: .25 caseless, Rubber, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolRubber + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxBigRubber25 + suffix: .25 caseless, Rubber, x4 big boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxCaselessRifleBigRubber + amount: 4 + +- type: entity # Practice + abstract: true + id: StorageFillAmmoBoxPractice25 + suffix: .25 caseless, Practice, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxPistolPractice + amount: 4 + +# Shotgun ammo +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxLethalShotgun + suffix: Shotgun, Lethal, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxLethalshot + amount: 2 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxRubberShotgun + suffix: Shotgun, Rubber, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxBeanbag + amount: 2 + +- type: entity # Practice + abstract: true + id: StorageFillAmmoBoxPracticeShotgun + suffix: Shotgun, Practice, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxShotgunPractice + amount: 2 + +- type: entity # Incendiary + abstract: true + id: StorageFillAmmoBoxIncendiaryShotgun + suffix: Shotgun, Incendiary, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxShotgunIncendiary + amount: 2 + +- type: entity # Uranium + abstract: true + id: StorageFillAmmoBoxUraniumShotgun + suffix: Shotgun, Uranium, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxShotgunUranium + amount: 2 + +- type: entity # Slugs + abstract: true + id: StorageFillAmmoBoxSlugShotgun + suffix: Shotgun, Slugs, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxShotgunSlug + amount: 2 + +- type: entity # Flare + abstract: true + id: StorageFillAmmoBoxFlareShotgun + suffix: Shotgun, Flare, x2 boxes + components: + - type: StorageFill + contents: + - id: BoxShotgunFlare + amount: 2 + +# .45 ammo +- type: entity # Lethal + abstract: true + id: StorageFillAmmoBoxLethal45 + suffix: .45, Lethal, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnum + amount: 4 + +- type: entity # Rubber + abstract: true + id: StorageFillAmmoBoxRubber45 + suffix: .45, Rubber, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnumRubber + amount: 4 + +- type: entity # Practice + abstract: true + id: StorageFillAmmoBoxPractice45 + suffix: .45, Practice, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnumPractice + amount: 4 + +- type: entity # Incendiary + abstract: true + id: StorageFillAmmoBoxIncendiary45 + suffix: .45, Incendiary, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnumIncendiary + amount: 4 + +- type: entity # Uranium + abstract: true + id: StorageFillAmmoBoxUranium45 + suffix: .45, Uranium, x4 boxes + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnumUranium + amount: 4 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml index 81c486b9732..ba3797f4d10 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml @@ -257,11 +257,30 @@ - type: RandomSpawner prototypes: # Empty crates - - SpawnDungeonLootCrateEmptyEngi + - CratePlasma + - CrateEngineering + - CrateElectrical + - CrateRadiation + - CrateUranium # Restocks - - SpawnDungeonLootCrateRestockEngi + - CrateVendingMachineRestockEngineeringFilled + - CrateVendingMachineRestockVendomatFilled + - CrateVendingMachineRestockRoboticsFilled + - CrateVendingMachineRestockAstroVendFilled + - CrateVendingMachineRestockTankDispenserFilled + # - CrateVendingMachineRestockFlatpackVendFilled # Mats - - SpawnDungeonLootCrateMaterials + - CrateMaterialGlass + - CrateMaterialSteel + - CrateMaterialPlastic + - CrateMaterialWood + - CrateMaterialPlasteel + - CrateMaterialPlasma + - CrateMaterialUranium + - CrateMaterialTextiles + - CrateMaterials + - CrateMaterialBrass + - WeldingFuelTankFull # Filled crates - CrateEngineeringGear - CrateEngineeringElectricalSupplies @@ -270,14 +289,28 @@ - CrateEngineeringCableHV - CrateEngineeringCableBulk - CrateEngineeringToolbox - - CrateEngineeringKitShipyardRcd - CrateEngineeringShuttle - chance: 0.95 + - CrateEngineeringFoamGrenade + - CrateEngineeringMiniJetpack + - CrateAirlockKit + - CrateEngineeringSpaceHeater + - CrateEngineeringSolar + - CrateTools + - CrateEngineerHardsuit + - CrateAtmosTechHardsuit + - CrateEngineeringThruster + - CrateEngineeringGyroscope + chance: 0.9 offset: 0.0 rarePrototypes: + # Mats + - WeldingFuelTankHighCapacity + # Filled crates + - CrateEngineeringKitShipyardRcd - CrateEngineeringKitRtg - CrateEngineeringKitFabrication - rareChance: 0.1 + - CrateEngineerChiefHardsuit + rareChance: 0.01 - type: entity name: random crate (empty) @@ -324,7 +357,7 @@ - CrateVendingMachineRestockRoboticsFilled - CrateVendingMachineRestockAstroVendFilled - CrateVendingMachineRestockTankDispenserFilled - - CrateVendingMachineRestockFlatpackVendFilled + # - CrateVendingMachineRestockFlatpackVendFilled chance: 1.0 offset: 0.0 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml index ace8c156c61..4f856692969 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml @@ -316,6 +316,7 @@ prototypes: # Empty Crates - CrateEmptySpawner + - GenericTank # Mats - CrateMaterialGlass - CrateMaterialSteel @@ -327,8 +328,16 @@ - CrateMaterialTextiles - CrateMaterials - CrateMaterialBrass + - CrateMaterialMetalRods + - CrateMaterialPaper + - WeldingFuelTankFull + - WaterTankFull chance: 1.0 offset: 0.0 + rarePrototypes: + - WeldingFuelTankHighCapacity + - WaterTankHighCapacity + rareChance: 0.01 - type: entity name: random crate (restock) @@ -772,7 +781,7 @@ chance: 0.9 offset: 0.0 rarePrototypes: - - MaterialDiamond + - MaterialDiamond1 rareChance: 0.01 - type: entity @@ -1072,7 +1081,7 @@ - VendingMachineRestockChemVend - VendingMachineRestockAstroVend - VendingMachineRestockAmmo - - VendingMachineRestockFlatpackVend + # - VendingMachineRestockFlatpackVend - VendingMachineRestockLessLethalVend - VendingMachineRestockNonLethalVend - VendingMachineRestockAutoTuneVend diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml index 7287a33c114..8541aae4210 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_hydroponics.yml @@ -80,19 +80,30 @@ - type: RandomSpawner prototypes: # Empty crates - - SpawnDungeonLootCrateEmptyHydro + - CrateHydroponics + - CrateHydroSecure + - CratePlastic + - CratePlasticBiodegradable # Restocks - - SpawnDungeonLootCrateRestockHydro + - CrateVendingMachineRestockNutriMaxFilled + - CrateVendingMachineRestockSeedsFilled + # Mats + - CrateMaterialGlass + - CrateMaterialSteel + - CrateMaterialPlastic + - CrateMaterialWood + - CrateMaterialTextiles + - CrateMaterialBiomass # Filled crates - CrateHydroponicsTools - CrateHydroponicsSeeds - CrateHydroponicsSeedsExotic - CrateHydroponicsSeedsMedicinal - chance: 0.95 + chance: 0.9 offset: 0.0 rarePrototypes: - CrateServiceKitHydroponics - rareChance: 0.05 + rareChance: 0.005 - type: entity name: random crate (restock) diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml index ab767436729..ae30ae6addb 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml @@ -189,9 +189,26 @@ - type: RandomSpawner prototypes: # Empty crates - - SpawnDungeonLootCrateEmptyService + - CrateFreezer + - CrateTrashCartJani + - CrateHydroponics + - CrateHydroSecure + - CratePlastic + - CratePlasticBiodegradable # Restocks - - SpawnDungeonLootCrateRestockService + - CrateVendingMachineRestockBoozeFilled + - CrateVendingMachineRestockChefvendFilled + - CrateVendingMachineRestockCondimentStationFilled + - CrateVendingMachineRestockDinnerwareFilled + - CrateVendingMachineRestockSmokesFilled + - CrateVendingMachineRestockHappyHonkFilled + # Mats + - CrateMaterialGlass + - CrateMaterialSteel + - CrateMaterialPlastic + - CrateMaterialWood + - CrateMaterialTextiles + - CrateMaterialBiomass # Filled crates - CrateServiceReplacementLights - CrateServiceReplacementColoredLights @@ -209,12 +226,13 @@ - CrateFoodBarSupply - CrateServiceBoozeDispenser - CrateSpaceCleaner - chance: 0.95 + - CrateServiceKitCleanades + chance: 0.9 offset: 0.0 rarePrototypes: - CrateServiceKitKitchen - CrateServiceKitHydroponics - rareChance: 0.05 + rareChance: 0.005 - type: entity name: random crate (restock) diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml index 2cd01bc44be..181b6c76fbd 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_medical.yml @@ -543,27 +543,45 @@ - type: RandomSpawner prototypes: # Empty crates - - SpawnDungeonLootCrateEmptyMed + - CrateMedical + - CrateSurgery + - CrateChemistrySecure # Restocks - - SpawnDungeonLootCrateRestockMed + - CrateVendingMachineRestockMedicalFilled + - CrateVendingMachineRestockChemVendFilled + - CrateVendingMachineRestockCiviMedVendFilled + # Mats + - CrateMaterialGlass + - CrateMaterialSteel + - CrateMaterialPlastic + - CrateMaterialTextiles + - CrateMaterialBiomass + - CrateChemistryD + - CrateChemistryP + - CrateChemistryS + - WaterTankFull # Filled crates - CrateBodyBags + - CrateMedicalRollerBeds - CrateChemistrySupplies - CrateChemistryVials - - CrateChemistryD - - CrateChemistryP - - CrateChemistryS - CrateMedicalSupplies - CrateMedicalSurgery - CrateMedicalScrubs - CrateVirologyBiosuit - chance: 0.95 + - CrateChemistrySecureKitChemist + - CrateMedicalSecureDoctor + - CrateMedicalSecureMedicine + - CrateMedicalSecureMedicinePierce + - CrateEvaKitParamedic + chance: 0.9 offset: 0.0 rarePrototypes: - CrateServiceKitMedbay - CrateServiceKitChemLab - CrateServiceKitMedbayCryo - rareChance: 0.05 + - CrateEvaKitCmo + rareChance: 0.01 - type: entity name: random crate (empty) diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml index 839b1c46a9e..d6febd2a05d 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml @@ -27,7 +27,7 @@ - Zipties - Handcuffs - ComputerIFFCircuitboard - chance: 0.95 + chance: 0.9 offset: 0.0 rarePrototypes: - SpawnDungeonLootHardsuitsMercenary @@ -71,7 +71,7 @@ - RiotShield - RiotLaserShield - ComputerIFFCircuitboard - chance: 0.85 + chance: 0.8 offset: 0.0 rarePrototypes: - ClothingOuterArmorReflective @@ -98,8 +98,17 @@ prototypes: - SpawnDungeonLootGunT1 - SpawnDungeonLootGunT1 + - SpawnDungeonLootGunT1 - SpawnDungeonLootMeleeT1 - chance: 0.8 + - SpawnDungeonLootMeleeT1 + - SpawnDungeonLootAmmoLethal + - SpawnDungeonLootAmmoLethal + - SpawnDungeonLootAmmoLethal + - SpawnDungeonLootAmmoLethal + - SpawnDungeonLootAmmoRubber + - SpawnDungeonLootAmmoRubber + - SpawnDungeonLootAmmoPractice + chance: 0.75 offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT2 @@ -127,7 +136,8 @@ - SpawnDungeonLootGunT2 - SpawnDungeonLootGunT2 - SpawnDungeonLootMeleeT2 - chance: 0.85 + - SpawnDungeonLootAmmoLethal + chance: 0.8 offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT3 @@ -154,7 +164,7 @@ prototypes: - SpawnDungeonLootMeleeT1 - SpawnDungeonLootMeleeT2 - chance: 0.85 + chance: 0.8 offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT3 @@ -180,7 +190,7 @@ - SpawnDungeonLootGunT3 - SpawnDungeonLootGunT3 - SpawnDungeonLootMeleeT3 - chance: 0.95 + chance: 0.9 offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT4 @@ -207,7 +217,7 @@ prototypes: - SpawnDungeonLootExplosivesT1 - SpawnDungeonLootExplosivesT2 - chance: 0.85 + chance: 0.8 offset: 0.0 rarePrototypes: - SpawnDungeonLootExplosivesT3 @@ -410,11 +420,38 @@ color: red - type: RandomSpawner prototypes: + # Empty crates + - CrateSecureMercenary + - CrateSecureMercenaryPrivateSec + - CrateAmmoGeneric + # Restocks + - CrateVendingMachineRestockAmmoFilled + - CrateVendingMachineRestockLessLethalVendFilled + - CrateVendingMachineRestockNonLethalVendFilled + # Filled crates + - CrateSecureMercenaryHardsuit + - CrateSecureMercenaryPrivateSecHardsuit + - CrateSecurityArmor + - CrateSecurityHelmet - CrateArmoryShotgunExpedition - CrateArmoryPistolsExpedition - CrateArmoryRifleGestioExpedition - CrateArmoryRifleNovaliteC1Expedition - CrateArmoryEnergyGunExpedition + # Ammo + - CrateAmmoBoxLethal20 + - CrateAmmoBoxLethal25 + - CrateAmmoBoxLethal30 + - CrateAmmoBoxLethal35 + - CrateAmmoBoxLethal45 + - CrateAmmoBoxLethalShotgun + - CrateAmmoBoxSlugShotgun + - CrateAmmoBoxRubber20 + - CrateAmmoBoxRubber25 + - CrateAmmoBoxRubber30 + - CrateAmmoBoxRubber35 + - CrateAmmoBoxRubber45 + - CrateAmmoBoxRubberShotgun chance: 0.85 offset: 0.0 rarePrototypes: @@ -423,7 +460,33 @@ - CrateArmorySMGExpedition - CrateArmoryLaserExpedition - CrateSecurityNonlethal - rareChance: 0.1 + - CrateSecureMercenaryHardsuitMagBoots + - CrateSecureMercenaryPrivateSecHardsuitMagBoots + # Ammo + - CrateAmmoBoxBigLethal20 + - CrateAmmoBoxBigLethal25 + - CrateAmmoBoxBigLethal30 + - CrateAmmoBoxBigRubber20 + - CrateAmmoBoxBigRubber25 + - CrateAmmoBoxIncendiary20 + - CrateAmmoBoxIncendiary30 + - CrateAmmoBoxIncendiary35 + - CrateAmmoBoxIncendiary45 + - CrateAmmoBoxIncendiaryShotgun + - CrateAmmoBoxUranium20 + - CrateAmmoBoxUranium30 + - CrateAmmoBoxUranium35 + - CrateAmmoBoxUranium45 + - CrateAmmoBoxUraniumShotgun + - CrateAmmoBoxFlareShotgun + - CrateAmmoBoxEmp35 + - CrateAmmoBoxPractice20 + - CrateAmmoBoxPractice25 + - CrateAmmoBoxPractice30 + - CrateAmmoBoxPractice35 + - CrateAmmoBoxPractice45 + - CrateAmmoBoxPracticeShotgun + rareChance: 0.05 - type: entity name: random crate @@ -496,8 +559,8 @@ offset: 0.0 rarePrototypes: - VendingMachineArcadia - - VendingMachineSec - - VendingMachineSecDrobe + #- VendingMachineSec + #- VendingMachineSecDrobe - SpawnDungeonMachineFrame rareChance: 0.01 @@ -522,6 +585,3 @@ - AmmoTechFab chance: 1 offset: 0.0 - rarePrototypes: - - SecurityTechFab - rareChance: 0.01 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml index 80615332aff..a25211956ec 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml @@ -116,19 +116,87 @@ - type: RandomSpawner prototypes: # Empty crates - - SpawnDungeonLootCrateEmptyEngi + - CrateScienceSecure + - CratePlasma + - CrateEngineering + - CrateElectrical + - CrateRadiation + - CrateUranium + - CrateMedical + - CrateSurgery + - CrateChemistrySecure # Restocks - - SpawnDungeonLootCrateRestockEngi + - CrateVendingMachineRestockEngineeringFilled + - CrateVendingMachineRestockVendomatFilled + - CrateVendingMachineRestockRoboticsFilled + - CrateVendingMachineRestockAstroVendFilled + - CrateVendingMachineRestockTankDispenserFilled + # - CrateVendingMachineRestockFlatpackVendFilled + - CrateVendingMachineRestockMedicalFilled + - CrateVendingMachineRestockChemVendFilled + - CrateVendingMachineRestockCiviMedVendFilled # Mats - - SpawnDungeonLootCrateMaterials + - CrateMaterialGlass + - CrateMaterialSteel + - CrateMaterialPlastic + - CrateMaterialWood + - CrateMaterialPlasteel + - CrateMaterialPlasma + - CrateMaterialUranium + - CrateMaterialTextiles + - CrateMaterials + - CrateMaterialBrass + - CrateMaterialMetalRods + - CrateMaterialPaper + - WeldingFuelTankFull + - WaterTankFull # Filled crates - - SpawnDungeonLootCrateEngi - - SpawnDungeonLootCrateMed - chance: 0.95 + - CrateEngineeringGear + - CrateEngineeringElectricalSupplies + - CrateEngineeringCableLV + - CrateEngineeringCableMV + - CrateEngineeringCableHV + - CrateEngineeringCableBulk + - CrateEngineeringToolbox + - CrateEngineeringShuttle + - CrateEngineeringFoamGrenade + - CrateEngineeringMiniJetpack + - CrateAirlockKit + - CrateEngineeringSpaceHeater + - CrateEngineeringSolar + - CrateTools + - CrateEngineerHardsuit + - CrateAtmosTechHardsuit + - CrateEngineeringThruster + - CrateEngineeringGyroscope + - CrateBodyBags + - CrateMedicalRollerBeds + - CrateChemistrySupplies + - CrateChemistryVials + - CrateMedicalSupplies + - CrateMedicalSurgery + - CrateMedicalScrubs + - CrateVirologyBiosuit + - CrateChemistrySecureKitChemist + - CrateMedicalSecureDoctor + - CrateMedicalSecureMedicine + - CrateMedicalSecureMedicinePierce + - CrateEvaKitParamedic + chance: 0.9 offset: 0.0 rarePrototypes: - - CrateScienceLabBundle - rareChance: 0.03 + # Mats + - WeldingFuelTankHighCapacity + # Filled crates + - CrateEngineeringKitShipyardRcd + - CrateEngineeringKitRtg + - CrateEngineeringKitFabrication + - CrateEngineerChiefHardsuit + - CrateServiceKitMedbay + - CrateServiceKitChemLab + - CrateServiceKitMedbayCryo + - CrateEvaKitCmo + rareChance: 0.01 # Other - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml index cc0dbbd1cb7..0853edf3197 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml @@ -291,7 +291,7 @@ - OreProcessorIndustrialMachineCircuitboard - AmmoTechFabCircuitboard - ShuttleGunSvalinnMachineGunCircuitboard - - SecurityTechFabCircuitboard + #- SecurityTechFabCircuitboard - ComputerIFFCircuitboard rareChance: 0.03 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index 33a79fdd148..bf88f86085b 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -154,7 +154,7 @@ offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT3 - rareChance: 0.1 + rareChance: 0.15 - type: entity name: random weapon @@ -188,7 +188,7 @@ offset: 0.0 rarePrototypes: - SpawnDungeonLootGunT3 - rareChance: 0.1 + rareChance: 0.15 - type: entity name: random weapon @@ -243,7 +243,7 @@ offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT4 - rareChance: 0.1 + rareChance: 0.15 - type: entity name: random weapon @@ -270,12 +270,14 @@ - WeaponCaseLongLecterExpedition - WeaponCaseLongLaserCarbineExpedition - WeaponCaseLongHristovExpedition + - WeaponCaseShortSvalinnExpedition + - WeaponCaseShortAdvancedLaserExpedition #- WeaponCaseLongMusketExpedition chance: 1.0 offset: 0.0 rarePrototypes: - SpawnDungeonLootGunT4 - rareChance: 0.1 + rareChance: 0.15 - type: entity name: random weapon @@ -330,7 +332,7 @@ offset: 0.0 rarePrototypes: - SpawnDungeonLootMeleeT5 - rareChance: 0.01 + rareChance: 0.05 - type: entity name: random weapon @@ -354,8 +356,6 @@ - WeaponCaseLongM90Expedition - WeaponCaseLongC20r - WeaponCaseLongAkExpedition - - WeaponCaseShortSvalinnExpedition - - WeaponCaseShortAdvancedLaserExpedition - WeaponCaseHeavyAsmgtExpeditions - WeaponCaseLongEnforcerExpedition - WeaponCaseLongLaserCannonExpedition @@ -363,7 +363,7 @@ offset: 0.0 rarePrototypes: - SpawnDungeonLootGunT5 - rareChance: 0.01 + rareChance: 0.1 - type: entity name: random weapon @@ -462,3 +462,141 @@ - WeaponCaseShortC4 chance: 0.3 offset: 0.0 + +# Ammo +- type: entity + name: random ammo + id: SpawnDungeonLootAmmoLethal + parent: MarkerBasePlaceFree + suffix: "Dungeon, Ammo, Lethal" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + state: icon + - type: RandomSpawner + prototypes: + - WeaponCaseShortAmmoBoxLethal20 + - WeaponCaseShortAmmoBoxLethal30 + - WeaponCaseShortAmmoBoxLethal35 + - WeaponCaseShortAmmoBoxLethal25 + - WeaponCaseShortAmmoBoxLethalShotgun + - WeaponCaseShortAmmoBoxSlugShotgun + - WeaponCaseShortAmmoBoxLethal45 + chance: 0.8 + offset: 0.0 + rarePrototypes: + - WeaponCaseShortAmmoBoxBigLethal20 + - WeaponCaseShortAmmoBoxBigLethal30 + - WeaponCaseShortAmmoBoxBigLethal25 + - WeaponCaseShortAmmoBoxEmp35 + - WeaponCaseShortAmmoBoxFlareShotgun + - SpawnDungeonLootAmmoRubber + - SpawnDungeonLootAmmoPractice + - SpawnDungeonLootAmmoIncendiary + - SpawnDungeonLootAmmoUranium + rareChance: 0.01 + +- type: entity + name: random ammo + id: SpawnDungeonLootAmmoRubber + parent: MarkerBasePlaceFree + suffix: "Dungeon, Ammo, Rubber" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + state: icon + - type: RandomSpawner + prototypes: + - WeaponCaseShortAmmoBoxRubber20 + - WeaponCaseShortAmmoBoxRubber30 + - WeaponCaseShortAmmoBoxRubber35 + - WeaponCaseShortAmmoBoxRubber25 + - WeaponCaseShortAmmoBoxRubberShotgun + - WeaponCaseShortAmmoBoxRubber45 + chance: 0.7 + offset: 0.0 + rarePrototypes: + - WeaponCaseShortAmmoBoxBigRubber20 + - WeaponCaseShortAmmoBoxBigRubber25 + rareChance: 0.01 + +- type: entity + name: random ammo + id: SpawnDungeonLootAmmoPractice + parent: MarkerBasePlaceFree + suffix: "Dungeon, Ammo, Practice" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + state: icon + - type: RandomSpawner + prototypes: + - WeaponCaseShortAmmoBoxPractice20 + - WeaponCaseShortAmmoBoxPractice30 + - WeaponCaseShortAmmoBoxPractice35 + - WeaponCaseShortAmmoBoxPractice25 + - WeaponCaseShortAmmoBoxPracticeShotgun + - WeaponCaseShortAmmoBoxPractice45 + chance: 0.6 + offset: 0.0 + +- type: entity + name: random ammo + id: SpawnDungeonLootAmmoIncendiary + parent: MarkerBasePlaceFree + suffix: "Dungeon, Ammo, Incendiary" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + state: icon + - type: RandomSpawner + prototypes: + - WeaponCaseShortAmmoBoxIncendiary20 + - WeaponCaseShortAmmoBoxIncendiary30 + - WeaponCaseShortAmmoBoxIncendiary35 + - WeaponCaseShortAmmoBoxIncendiaryShotgun + - WeaponCaseShortAmmoBoxIncendiary45 + chance: 0.5 + offset: 0.0 + rarePrototypes: + - SpawnDungeonLootAmmoUranium + rareChance: 0.01 + +- type: entity + name: random ammo + id: SpawnDungeonLootAmmoUranium + parent: MarkerBasePlaceFree + suffix: "Dungeon, Ammo, Uranium" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + state: icon + - type: RandomSpawner + prototypes: + - WeaponCaseShortAmmoBoxUranium20 + - WeaponCaseShortAmmoBoxUranium30 + - WeaponCaseShortAmmoBoxUranium35 + - WeaponCaseShortAmmoBoxUraniumShotgun + - WeaponCaseShortAmmoBoxUranium45 + chance: 0.4 + offset: 0.0 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/weapon_cases.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml similarity index 66% rename from Resources/Prototypes/_NF/Entities/Objects/Tools/weapon_cases.yml rename to Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml index b4548ef96ad..f85e21f16ab 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/weapon_cases.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml @@ -8,14 +8,14 @@ - type: ExplosionResistance damageCoefficient: 0.3 - type: Sprite - sprite: _NF/Objects/Tools/guncaselong.rsi + sprite: _NF/Objects/Storage/Cases/guncaselong.rsi layers: - map: [ base ] state: icon - state: unshaded shader: unshaded - type: Item - sprite: _NF/Objects/Tools/guncaselong.rsi + sprite: _NF/Objects/Storage/Cases/guncaselong.rsi - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -47,10 +47,10 @@ suffix: Short components: - type: Sprite - sprite: _NF/Objects/Tools/guncaseshort.rsi + sprite: _NF/Objects/Storage/Cases/guncaseshort.rsi - type: Item size: Large - sprite: _NF/Objects/Tools/guncaseshort.rsi + sprite: _NF/Objects/Storage/Cases/guncaseshort.rsi - type: Storage maxItemSize: Normal grid: @@ -68,6 +68,30 @@ tags: - Cartridge +- type: entity + name: ammo case + parent: WeaponCaseShort + id: WeaponCaseShortAmmo + description: A reinforced casing for storing ammo. + suffix: Short + components: + - type: Sprite + sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + - type: Item + sprite: _NF/Objects/Storage/Cases/ammocaseshort.rsi + +- type: entity + name: explosives case + parent: WeaponCaseShort + id: WeaponCaseShortExplosives + description: A reinforced casing for storing explosives. + suffix: Short + components: + - type: Sprite + sprite: _NF/Objects/Storage/Cases/explosivescaseshort.rsi + - type: Item + sprite: _NF/Objects/Storage/Cases/explosivescaseshort.rsi + - type: entity name: weapon case parent: WeaponCaseLong @@ -77,10 +101,10 @@ components: - type: MultiHandedItem - type: Sprite - sprite: _NF/Objects/Tools/guncaseheavy.rsi + sprite: _NF/Objects/Storage/Cases/guncaseheavy.rsi - type: Item size: Ginormous - sprite: _NF/Objects/Tools/guncaseheavy.rsi + sprite: _NF/Objects/Storage/Cases/guncaseheavy.rsi - type: Storage maxItemSize: Ginormous grid: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index b084c9feaa7..1600d76bf9c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -197,6 +197,16 @@ - type: AccessReader access: [["Security"]] +- type: entity + parent: CrateGenericSteel + id: CrateAmmoGeneric + name: ammo crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/ammo.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/ammo.rsi + - type: entity parent: CratePirate id: CratePirateGrey @@ -229,3 +239,50 @@ sprite: _NF/Structures/Storage/Crates/mccargo.rsi - type: Sprite sprite: _NF/Structures/Storage/Crates/mccargo.rsi + +# Mercenary +- type: entity + parent: CrateBaseSecure + id: CrateSecureMercenary + name: mercenary crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/secure_mercenary.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/secure_mercenary.rsi + - type: AccessReader + access: [["Mercenary"]] + +- type: entity + parent: CrateBaseSecure + id: CrateSecureMercenaryPrivateSec + name: private security crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/secure_privatesec.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/secure_privatesec.rsi + - type: AccessReader + access: [["Mercenary"]] + +- type: entity + parent: CrateBaseSecure + id: CrateAmmoSecureMercenary + name: secure ammo crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/secure_ammo.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/secure_ammo.rsi + - type: AccessReader + access: [["Mercenary"]] + +- type: entity + parent: CrateWeaponSecure + id: CrateFirearmsSecure + name: secure firearms crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/secure_firearms.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/secure_firearms.rsi diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml index c2a37360082..10129e68d3e 100644 --- a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml +++ b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_inventory_template.yml @@ -31,7 +31,6 @@ stripTime: 999999 # "Not strippable" uiWindowPos: 2,1 strippingWindowPos: 2,0 - dependsOn: jumpsuit displayName: ID - name: back diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml index b93d1e9fdd7..037ad90c3a7 100644 --- a/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml +++ b/Resources/Prototypes/_NF/InventoryTemplates/hostile_humanoid_simplified_inventory_template.yml @@ -57,3 +57,13 @@ uiWindowPos: 2,1 strippingWindowPos: 22,22 displayName: Gloves + + - name: id + slotTexture: id + fullTextureName: template_small + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 999999 # "Not strippable" + uiWindowPos: 2,1 + strippingWindowPos: 22,20 + displayName: ID diff --git a/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml b/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml new file mode 100644 index 00000000000..f711a52b57e --- /dev/null +++ b/Resources/Prototypes/_NF/InventoryTemplates/hostile_nonhumanoid_inventory_template.yml @@ -0,0 +1,13 @@ +- type: inventoryTemplate + id: hostilenonhumanoid + slots: +# "Not strippable", "hidden" + - name: id + slotTexture: id + fullTextureName: template_small + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 999999 # "Not strippable" + uiWindowPos: 2,1 + strippingWindowPos: 22,20 + displayName: ID diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon-open.png new file mode 100644 index 00000000000..76255a387c0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon-open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon.png new file mode 100644 index 00000000000..6ce7e319421 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-left.png new file mode 100644 index 00000000000..36e94e18177 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-right.png new file mode 100644 index 00000000000..0debbd10ad4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/meta.json rename to Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/unshaded.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/unshaded.png rename to Resources/Textures/_NF/Objects/Storage/Cases/ammocaseshort.rsi/unshaded.png diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon-open.png new file mode 100644 index 00000000000..40e8f2b6c9d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon-open.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon.png new file mode 100644 index 00000000000..014cccd617a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-left.png new file mode 100644 index 00000000000..bb4fbdc2b9d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-right.png new file mode 100644 index 00000000000..a4739488625 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/meta.json rename to Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/unshaded.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/unshaded.png rename to Resources/Textures/_NF/Objects/Storage/Cases/explosivescaseshort.rsi/unshaded.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon-open.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon-open.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/icon.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/meta.json rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/unshaded.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi/unshaded.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseheavy.rsi/unshaded.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon-open.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon-open.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/icon.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaselong.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json new file mode 100644 index 00000000000..a8107eefdfb --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/obj/storage/case.dmi , held sprites and open sprite made by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "unshaded", + "delays": [ + [ 0.2, 0.1, 0.1, 0.2 ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/unshaded.png new file mode 100644 index 00000000000..d598b670413 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/guncaselong.rsi/unshaded.png differ diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon-open.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon-open.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon-open.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/icon.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Tools/guncaseshort.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json new file mode 100644 index 00000000000..a8107eefdfb --- /dev/null +++ b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/obj/storage/case.dmi , held sprites and open sprite made by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "unshaded", + "delays": [ + [ 0.2, 0.1, 0.1, 0.2 ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/unshaded.png b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/unshaded.png new file mode 100644 index 00000000000..d598b670413 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Cases/guncaseshort.rsi/unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/base.png new file mode 100644 index 00000000000..ffa20a57d26 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/closed.png new file mode 100644 index 00000000000..1b3053fb65b Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/icon.png new file mode 100644 index 00000000000..f3605542d4a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json new file mode 100644 index 00000000000..8f83f57cf0e --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7cb618c69b75873f3ce893022fe08d1233b3152d/icons/obj/structures/crates.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "welded" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/open.png new file mode 100644 index 00000000000..defa0f91f5d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/welded.png new file mode 100644 index 00000000000..f07cb52d0fd Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/ammo.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/base.png new file mode 100644 index 00000000000..a157ca0afdf Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/closed.png new file mode 100644 index 00000000000..3967169f3a1 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/icon.png new file mode 100644 index 00000000000..0385c324bf0 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/locked.png new file mode 100644 index 00000000000..db091212614 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json new file mode 100644 index 00000000000..ad6f2bd22d5 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7cb618c69b75873f3ce893022fe08d1233b3152d/icons/obj/structures/crates.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "welded" + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/open.png new file mode 100644 index 00000000000..e3f526a9ffc Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/sparks.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/sparks.png new file mode 100644 index 00000000000..f95b8e2093e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/sparks.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/unlocked.png new file mode 100644 index 00000000000..b1430d31a3c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_ammo.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/base.png new file mode 100644 index 00000000000..3bbae3f80f9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/closed.png new file mode 100644 index 00000000000..e5f6b18d3b6 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/icon.png new file mode 100644 index 00000000000..79068e7670c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/locked.png new file mode 100644 index 00000000000..34188570825 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json new file mode 100644 index 00000000000..03349899fe9 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/79665 | Recolored and adjusted sprite size by erhardsteinhauer (discord/github)", + "size": { + "x": 32, + "y": 36 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/open.png new file mode 100644 index 00000000000..7338b6c9636 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/sparking.png new file mode 100644 index 00000000000..68d57cddf19 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/sparking.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/unlocked.png new file mode 100644 index 00000000000..aa4127fcf31 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/welded.png new file mode 100644 index 00000000000..4615601fc96 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_firearms.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/base.png new file mode 100644 index 00000000000..b9a919ba41a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/closed.png new file mode 100644 index 00000000000..3675061d8be Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/icon.png new file mode 100644 index 00000000000..4b6c0681219 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/locked.png new file mode 100644 index 00000000000..34188570825 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json new file mode 100644 index 00000000000..03349899fe9 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/79665 | Recolored and adjusted sprite size by erhardsteinhauer (discord/github)", + "size": { + "x": 32, + "y": 36 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/open.png new file mode 100644 index 00000000000..c115a291556 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/sparking.png new file mode 100644 index 00000000000..68d57cddf19 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/sparking.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/unlocked.png new file mode 100644 index 00000000000..aa4127fcf31 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/welded.png new file mode 100644 index 00000000000..1d185bef25d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_mercenary.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/base.png new file mode 100644 index 00000000000..9aa5cb2aec6 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/closed.png new file mode 100644 index 00000000000..efa5d5e5b5a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/closed.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/icon.png new file mode 100644 index 00000000000..c03e77917b8 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/locked.png new file mode 100644 index 00000000000..34188570825 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json new file mode 100644 index 00000000000..03349899fe9 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/79665 | Recolored and adjusted sprite size by erhardsteinhauer (discord/github)", + "size": { + "x": 32, + "y": 36 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/open.png new file mode 100644 index 00000000000..b6d7f32e967 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/sparking.png new file mode 100644 index 00000000000..68d57cddf19 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/sparking.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/unlocked.png new file mode 100644 index 00000000000..aa4127fcf31 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/welded.png new file mode 100644 index 00000000000..1d185bef25d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/secure_privatesec.rsi/welded.png differ