diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index dea18d3b1d6..9a3f3139236 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -20,20 +20,20 @@ - type: cargoProduct id: ArmorySmg icon: - sprite: Objects/Weapons/Guns/SMGs/wt550.rsi + sprite: Objects/Weapons/Guns/SMGs/drozd.rsi state: icon product: CrateArmorySMG - cost: 9000 + cost: 8000 # Funky change, from 9000 to 8000 category: cargoproduct-category-name-armory group: market - type: cargoProduct id: ArmoryShotgun icon: - sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi + sprite: Objects/Weapons/Guns/Shotguns/pump.rsi state: icon product: CrateArmoryShotgun - cost: 7000 + cost: 6500 # Funky change, from 7000 to 6500 category: cargoproduct-category-name-armory group: market @@ -43,7 +43,7 @@ sprite: Clothing/OuterClothing/Armor/riot.rsi state: icon product: CrateSecurityRiot - cost: 7500 + cost: 4000 category: cargoproduct-category-name-armory group: market @@ -63,7 +63,7 @@ sprite: Structures/Machines/bomb.rsi state: training-bomb product: CrateTrainingBombs - cost: 3000 + cost: 1000 # Funky change, from 3000 to 1000 category: cargoproduct-category-name-armory group: market @@ -83,7 +83,7 @@ sprite: Objects/Weapons/Guns/Pistols/mk58.rsi state: icon product: CrateArmoryPistols - cost: 5200 + cost: 3000 # Funky change, from 5200 to 3000 category: cargoproduct-category-name-armory group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 5f1c2e07e00..07483e7c186 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -18,15 +18,15 @@ category: cargoproduct-category-name-cargo group: market -- type: cargoProduct - id: CargoLuxuryHardsuit - icon: - sprite: Clothing/Head/Hardsuits/luxury.rsi - state: icon - product: CrateCargoLuxuryHardsuit - cost: 15000 - category: cargoproduct-category-name-cargo - group: market +#- type: cargoProduct # Funky change, made no lunger purchasable, Luxury is unique to the QM. +# id: CargoLuxuryHardsuit +# icon: +# sprite: Clothing/Head/Hardsuits/luxury.rsi +# state: icon +# product: CrateCargoLuxuryHardsuit +# cost: 15000 +# category: cargoproduct-category-name-cargo +# group: market - type: cargoProduct id: CargoParcelWrap diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index dc0a3f743da..d131da8c31c 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -257,15 +257,15 @@ category: cargoproduct-category-name-fun group: market -- type: cargoProduct - id: HydratedScurret - icon: - sprite: Structures/Wallmounts/posters.rsi - state: poster55_legit - product: CrateFunScurret - cost: 25000 # You will surely not regret buying this - category: cargoproduct-category-name-fun - group: market +#- type: cargoProduct # Funky change, removed ability to purchase this, added into the gamba pool instead. +# id: HydratedScurret +# icon: +# sprite: Structures/Wallmounts/posters.rsi +# state: poster55_legit +# product: CrateFunScurret +# cost: 25000 # You will surely not regret buying this # +# category: cargoproduct-category-name-fun +# group: market - type: cargoProduct id: FunCrateGambling @@ -274,7 +274,7 @@ state: cash_1000000 product: CrateCargoGambling cost: 10000 - category: cargoproduct-category-name-fun + category: cargoproduct-category-name-cargo # Funky change, gamba crates are classified as a cargo department crate. group: market - type: cargoProduct diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index d725e1fcc44..f9c62bad22d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -21,25 +21,25 @@ # SPDX-FileCopyrightText: 2025 T # SPDX-License-Identifier: MIT -- type: cargoProduct - id: SecurityArmor - icon: - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi - state: icon - product: CrateSecurityArmor - cost: 1250 - category: cargoproduct-category-name-security - group: market +#- type: cargoProduct #Funky Station, replaced by the standard armor crate +# id: SecurityArmor +# icon: +# sprite: Clothing/OuterClothing/Armor/bulletproof.rsi +# state: icon +# product: CrateSecurityArmor +# cost: 1250 +# category: cargoproduct-category-name-security +# group: market -- type: cargoProduct - id: SecurityHelmet - icon: - sprite: Clothing/Head/Helmets/security.rsi - state: icon - product: CrateSecurityHelmet - cost: 550 - category: cargoproduct-category-name-security - group: market +#- type: cargoProduct #Funky Station, replaced by the standard armor crate +# id: SecurityHelmet +# icon: +# sprite: Clothing/Head/Helmets/security.rsi +# state: icon +# product: CrateSecurityHelmet +# cost: 550 +# category: cargoproduct-category-name-security +# group: market - type: cargoProduct id: SecurityNonLethal diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index f29a7d5983a..33f6dbb6419 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -25,26 +25,26 @@ name: SMG crate description: Contains two SMGs with four mags. Requires Armory access to open. components: - - type: EntityTableContainerFill + - type: EntityTableContainerFill # Funky change, replaced the WT550 with a Drozd SMG containers: entity_storage: !type:AllSelector children: - - id: WeaponSubMachineGunWt550 + - id: WeaponSubMachineGunDrozd amount: 2 - - id: MagazinePistolSubMachineGunTopMounted + - id: MagazinePistolSubMachineGun amount: 4 - type: entity parent: [ CrateWeaponSecure, BaseSecurityContraband ] id: CrateArmoryShotgun 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. + description: For when the enemy absolutely needs to be replaced with lead. Contains two Kammerer Shotguns, and some standard shotgun shells. Requires Armory access to open. # Funky change, replaced the Enforcers with Kammerers components: - type: EntityTableContainerFill containers: entity_storage: !type:AllSelector children: - - id: WeaponShotgunEnforcer + - id: WeaponShotgunKammerer amount: 2 - id: BoxLethalshot amount: 4 @@ -101,25 +101,23 @@ amount: 4 - type: entity - parent: [ CrateWeaponSecure, BaseSecurityContraband ] id: CrateSecurityRiot - name: swat crate - description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. + parent: [ CrateWeaponSecure, BaseSecurityContraband ] + name: riot gear crate + description: Contains two sets of riot armor, helmets, gas masks and shields as well as four tear gas grenades, Requires Armory access to open. # Funky change components: - - type: EntityTableContainerFill - containers: - entity_storage: !type:AllSelector - children: - - id: ClothingOuterArmorRiot - amount: 2 - - id: ClothingHeadHelmetRiot - amount: 2 - - id: WeaponShotgunEnforcerRubber - amount: 2 - - id: BoxBeanbag - amount: 2 - - id: RiotShield - amount: 2 + - type: StorageFill + contents: + - id: ClothingOuterArmorRiot + amount: 2 + - id: ClothingHeadHelmetRiot + amount: 2 + - id: ClothingMaskGasSecurity + amount: 2 + - id: RiotShield + amount: 2 + - id: TearGasGrenade + amount: 4 - type: entity parent: [ CrateWeaponSecure, BaseSecurityContraband ] diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index ef91116a878..30480462a5b 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -74,12 +74,13 @@ parent: CrateGenericSteel id: CrateMaterialWood name: wood crate - description: Bunch of wood planks. + description: 90 wooden planks. components: - type: EntityTableContainerFill containers: entity_storage: id: MaterialWoodPlank + amount: 3 # Funky change - type: entity parent: CrateGenericSteel diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index 0aa8b4e4670..74ab5bb6702 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -23,19 +23,23 @@ name: medical supplies crate description: Basic medical supplies. components: - - type: EntityTableContainerFill + - type: EntityTableContainerFill # Funky Station, changed the fills to only be treatment supplies containers: entity_storage: !type:AllSelector children: - - id: MedkitFilled - amount: 2 + - id: Brutepack + amount: 3 - id: Gauze - amount: 2 + amount: 3 - id: Bloodpack - amount: 2 - - id: BoxLatexGloves - - id: BoxSterileMask - - id: BoxMouthSwab + amount: 3 + - id: Ointment + amount: 3 + - id: PillCanisterTricordrazine + amount: 3 +# - id: PillCanisterGranibitulari +# amount: 3 + - id: HandheldHealthAnalyzer - type: entity parent: CrateMedical diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index a683ee81de6..5332ca2d66b 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -27,27 +27,24 @@ id: CrateSalvageEquipment name: "salvage equipment crate" suffix: Filled - description: For the daring. + description: For the daring. Contains a Spationaugh Hardsuit, air tanks, magboots, tool belt, PKA, GPS and Radio. # Funky Station components: - type: EntityTableContainerFill containers: entity_storage: !type:AllSelector children: - - id: ClothingOuterHardsuitSalvage - - id: ClothingMaskBreath + - id: ClothingOuterHardsuitSpatio + - id: ClothingMaskGasExplorer - id: OxygenTankFilled - - id: FireExtinguisher + - id: NitrogenTankFilled - id: ClothingShoesBootsMag - - id: HandHeldMassScanner - id: Pickaxe - - id: Welder - - id: Wrench - - id: Screwdriver - - id: Crowbar - - id: Wirecutter - - id: ClothingBeltUtility + - id: ClothingBeltUtilityFilled - id: OreBag - - id: ClothingBeltSalvageWebbing + - id: WeaponProtoKineticAccelerator + - id: ClothingEyesGlassesMeson + - id: HandheldGPSBasic + - id: RadioHandheld - type: entity parent: CrateGenericSteel diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 61dc4babba5..a38ce9a4f0d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -958,7 +958,7 @@ - type: entity name: energy magnum parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] - id: WeaponEnergyMagnum + id: sWeaponEnergyMagnum description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling. components: - type: Sprite diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml new file mode 100644 index 00000000000..ce4c91a153f --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml @@ -0,0 +1,25 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# SPDX-FileCopyrightText: 2025 mkanke-real +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: FultonSupplies + icon: + sprite: Objects/Tools/fulton.rsi + state: extraction_pack + product: CrateFultonSupplies + cost: 1000 + category: cargoproduct-category-name-cargo + group: market + +- type: cargoProduct + id: SalvageEquipment + icon: + sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi + state: icon + product: CrateSalvageEquipment + cost: 7500 + category: cargoproduct-category-name-cargo + group: market diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml new file mode 100644 index 00000000000..708840382a0 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml @@ -0,0 +1,27 @@ +# SPDX-FileCopyrightText: 2025 8tv +# SPDX-FileCopyrightText: 2025 AtlasHD <99688062+AtlasHDD@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# SPDX-FileCopyrightText: 2025 unknown +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: EngineeringEquipment + icon: + sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi + state: icon + product: CrateEngineeringEquipment + cost: 6000 + category: cargoproduct-category-name-engineering + group: market + +- type: cargoProduct + id: EngineeringAtmosEquipment + icon: + sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi + state: icon + product: CrateEngineeringAtmosEquipment + cost: 8000 + category: cargoproduct-category-name-engineering + group: market diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_materials.yml new file mode 100644 index 00000000000..16aaf529a0a --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_materials.yml @@ -0,0 +1,73 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: MaterialGlassBulk + icon: + sprite: Objects/Materials/Sheets/glass.rsi + state: glass_3 + product: CrateMaterialGlassBulk + cost: 4250 + category: cargoproduct-category-name-materials + group: market + +- type: cargoProduct + id: MaterialSteelBulk + icon: + sprite: Objects/Materials/Sheets/metal.rsi + state: steel_3 + product: CrateMaterialSteelBulk + cost: 4250 + category: cargoproduct-category-name-materials + group: market + +- type: cargoProduct + id: MaterialPlasticBulk + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: plastic_3 + product: CrateMaterialPlasticBulk + cost: 5500 + category: cargoproduct-category-name-materials + group: market + +- type: cargoProduct + id: MaterialPlasmaBulk + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: plasma_3 + product: CrateMaterialPlasmaBulk + cost: 5500 + category: cargoproduct-category-name-materials + group: market + +- type: cargoProduct + id: MaterialWood + icon: + sprite: Objects/Materials/materials.rsi + state: wood_3 + product: CrateMaterialWood + cost: 1000 + category: cargoproduct-category-name-materials + group: market + +- type: cargoProduct + id: MaterialUranium + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: uranium_3 + product: CrateMaterialUranium + cost: 5000 + category: cargoproduct-category-name-materials + group: market + +- type: cargoProduct + id: MaterialBasicResourceBulk + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: generic_materials + product: CrateMaterialBasicResourceBulk + cost: 4500 + category: cargoproduct-category-name-materials + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_medical.yml new file mode 100644 index 00000000000..edd9eee2c9b --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_medical.yml @@ -0,0 +1,55 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# SPDX-FileCopyrightText: 2025 mkanke-real +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: EmergencyDefibrillator + icon: + sprite: Objects/Specific/Medical/defib.rsi + state: icon + product: CrateEmergencyDefibrillator + cost: 1400 + category: cargoproduct-category-name-medical + group: market + +- type: cargoProduct + id: EmergencyMedipens + icon: + sprite: Objects/Specific/Medical/medipen.rsi + state: medipen + product: CrateEmergencyMedipens + cost: 1500 + category: cargoproduct-category-name-medical + group: market + +- type: cargoProduct + id: MedicalEquipment + icon: + sprite: Objects/Specific/Medical/healthanalyzer.rsi + state: icon + product: CrateMedicalEquipment + cost: 2000 + category: cargoproduct-category-name-medical + group: market + +- type: cargoProduct + id: MedicalParamedSuit + icon: + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: firstaid + product: CrateMedicalParamedEquipment + cost: 5500 + category: cargoproduct-category-name-medical + group: market + +- type: cargoProduct + id: MedicalBiomass + icon: + sprite: Objects/Misc/monkeycube.rsi + state: cube + product: CrateMedicalBiomass + cost: 3000 + category: cargoproduct-category-name-medical + group: market diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_security.yml new file mode 100644 index 00000000000..e1e3213e905 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_security.yml @@ -0,0 +1,43 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: SwatArmor + icon: + sprite: Clothing/Mask/swat.rsi + state: icon + product: CrateSecuritySwat + cost: 6500 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: SecurityHardsuit + icon: + sprite: Clothing/OuterClothing/Hardsuits/security.rsi + state: icon + product: CrateSecurityHardsuit + cost: 8000 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: SecurityEquipment + icon: + sprite: Clothing/Belt/security.rsi + state: icon + product: CrateSecurityEquipment + cost: 3000 + category: cargoproduct-category-name-security + group: market + +- type: cargoProduct + id: SecurityBasicArmor + icon: + sprite: Clothing/Head/Helmets/security.rsi + state: icon + product: CrateSecurityBasicArmor + cost: 2000 + category: cargoproduct-category-name-security + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_service.yml new file mode 100644 index 00000000000..d1a2dd36a35 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_service.yml @@ -0,0 +1,25 @@ +# SPDX-FileCopyrightText: 2025 McBosserson +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: cargoProduct + id: ServiceColoredLightTubes + icon: + sprite: Objects/Power/light_tube.rsi + state: normal + product: CrateServiceColoredLightTubes + cost: 800 + category: cargoproduct-category-name-service + group: market + +- type: cargoProduct + id: ServiceColoredLightBulb + icon: + sprite: Objects/Power/light_bulb.rsi + state: normal + product: CrateServiceColoredLightBulb + cost: 800 + category: cargoproduct-category-name-service + group: market diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Boxes/general.yml new file mode 100644 index 00000000000..456bdd94d56 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Boxes/general.yml @@ -0,0 +1,48 @@ +# SPDX-FileCopyrightText: 2025 Rainbow +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneMoon@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 vectorassembly +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + name: colored lighttube box + parent: BoxLightbulb + id: BoxLightTubeColored + components: + - type: StorageFill + contents: + - id: LightTubeCrystalBlue + - id: LightTubeCrystalBlue + - id: LightTubeCrystalCyan + - id: LightTubeCrystalCyan + - id: LightTubeCrystalGreen + - id: LightTubeCrystalGreen + - id: LightTubeCrystalOrange + - id: LightTubeCrystalOrange + - id: LightTubeCrystalPink + - id: LightTubeCrystalPink + - id: LightTubeCrystalRed + - id: LightTubeCrystalRed + +- type: entity + name: colored lighttube box + parent: BoxLightbulb + id: BoxLightBulbColored + components: + - type: StorageFill + contents: + - id: LightBulbCrystalBlue + - id: LightBulbCrystalBlue + - id: LightBulbCrystalCyan + - id: LightBulbCrystalCyan + - id: LightBulbCrystalGreen + - id: LightBulbCrystalGreen + - id: LightBulbCrystalOrange + - id: LightBulbCrystalOrange + - id: LightBulbCrystalPink + - id: LightBulbCrystalPink + - id: LightBulbCrystalRed + - id: LightBulbCrystalRed diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/armory.yml new file mode 100644 index 00000000000..7c5759d3b53 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/armory.yml @@ -0,0 +1,72 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: CrateSecuritySwat + parent: [ CrateWeaponSecure, BaseSecurityContraband ] + name: swat gear crate + description: Contains two sets of swat armor, helmets, gas masks, jackboots, combat gloves and shields as well as four flashbangs. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorBulletproof + amount: 2 + - id: ClothingHeadHelmetSwat + amount: 2 + - id: ClothingMaskGasSwat + amount: 2 + - id: RiotBulletShield + amount: 2 + - id: ClothingShoesBootsJackFilled + amount: 2 + - id: ClothingHandsGlovesCombat + amount: 2 + - id: GrenadeFlashBang + amount: 4 + +- type: entity + id: CrateSecurityHardsuit + parent: [ CrateWeaponSecure, BaseSecurityContraband ] + name: security hardsuit crate + description: Contains a set of two security hardsuits and pair of airtanks. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSecurity + amount: 2 + - id: NitrogenTank + amount: 2 + - id: OxygenTank + amount: 2 + +- type: entity + id: CrateSecurityEquipment + parent: CrateSecgear + name: security equipment crate + description: Supplies for protecting and serving, contains a armor vest, helmet, flash, disabler, security glasses and belt, holobarrier projector, jackboots, seclite and the security guidebooks. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorBasic + - id: ClothingHeadHelmetBasic + - id: Flash + - id: ClothingBeltSecurityFilled + - id: WeaponDisabler + - id: FlashlightSeclite + - id: ClothingEyesGlassesSecurity + - id: BookSecurity + - id: BookSpaceLaw + +- type: entity + id: CrateSecurityBasicArmor + parent: CrateSecgear + name: standard armor crate + description: Contains three sets of standard issue security armor vests and helmets. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingHeadHelmetBasic + amount: 3 + - id: ClothingOuterArmorBasic + amount: 3 diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/botany.yml new file mode 100644 index 00000000000..9c11e0dedf1 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/botany.yml @@ -0,0 +1,28 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: CrateHydroponicsChemicals + parent: CrateHydroSecure + name: botanical chemicals crate + description: Any entrepreneuring botanist's dream. Contains many botanical chemicals. Requires Hydroponics access to open. + components: + - type: StorageFill + contents: + - id: DiethylamineChemistryBottle + amount: 4 + - id: EZNutrientChemistryBottle + amount: 4 + - id: RobustHarvestChemistryBottle + amount: 2 + - id: Left4ZedChemistryBottle + amount: 4 + - id: UnstableMutagenChemistryBottle + amount: 4 + - id: SedinChemistryBottle + amount: 2 + - id: CryoxadoneChemistryBottle + amount: 2 + - id: PhalanximineChemistryBottle + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/cargo.yml new file mode 100644 index 00000000000..e7b23b333a9 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/cargo.yml @@ -0,0 +1,17 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: CrateFultonSupplies + parent: CratePrivateSecure + name: fulton supplies crate + description: Contains 20 fulltons and a beacon to link with. + components: + - type: StorageFill + contents: + - id: Fulton + amount: 2 + - id: FultonBeacon + + \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/engineering.yml new file mode 100644 index 00000000000..21833c5a782 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/engineering.yml @@ -0,0 +1,47 @@ +# SPDX-FileCopyrightText: 2025 8tv +# SPDX-FileCopyrightText: 2025 AtlasHD <99688062+AtlasHDD@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com> +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# SPDX-FileCopyrightText: 2025 unknown +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: CrateEngineeringEquipment + parent: CrateEngineeringSecure + name: engineer equipment crate + description: Contains a Engineering Hardsuit, filled tool belt, meson glasses, RCD, alsongide the engineering guidebook. + components: + - type: StorageFill + contents: + - id: ClothingBeltUtilityEngineering + - id: ClothingEyesGlassesMeson + - id: ClothingOuterHardsuitEngineering + - id: ClothingShoesBootsMag + - id: NitrogenTankFilled + - id: OxygenTankFilled + - id: RCD + - id: RCDAmmo + +- type: entity + id: CrateEngineeringAtmosEquipment + parent: CrateEngineeringSecure + name: atmospheric technician equipment crate + description: Contains a Atmospheric Hardsuit and Firesuit, fire fighting backpack, atmospheric gas mask, filled tool belt, meson glasses, RCD and RPD alsongide the engineering guidebook. + components: + - type: StorageFill + contents: + - id: ClothingBeltUtilityEngineering + - id: ClothingEyesGlassesMeson + - id: ClothingOuterHardsuitAtmos + - id: ClothingHeadHelmetAtmosFire + - id: ClothingOuterSuitAtmosFire + - id: ClothingMaskGasAtmos + - id: ClothingShoesBootsMag + - id: NitrogenTankFilled + - id: OxygenTankFilled + - id: RCD + - id: RCDAmmo + - id: HolofanProjector + + diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/materials.yml new file mode 100644 index 00000000000..a54a7713e6f --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/materials.yml @@ -0,0 +1,74 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +- type: entity + id: CrateMaterialGlassBulk + parent: CrateGenericSteel + name: bulk glass sheet crate + description: 270 sheets of glass, packed with extreme care. + components: + - type: StorageFill + contents: + - id: SheetGlass + amount: 9 + +- type: entity + id: CrateMaterialSteelBulk + parent: CrateGenericSteel + name: bulk steel sheet crate + description: 270 sheets of steel. + components: + - type: StorageFill + contents: + - id: SheetSteel + amount: 9 + +- type: entity + id: CrateMaterialPlasticBulk + parent: CrateGenericSteel + name: bulk plastic sheet crate + description: 270 sheets of plastic. + components: + - type: StorageFill + contents: + - id: SheetPlastic + amount: 9 + +- type: entity + id: CrateMaterialPlasmaBulk + parent: CratePlasma + name: bulk solid plasma crate + description: 90 sheets of plasma. + components: + - type: StorageFill + contents: + - id: SheetPlasma + amount: 3 + +- type: entity + id: CrateMaterialUranium + parent: CratePlasma + name: uranium sheet crate + description: 30 sheets of uranium. + components: + - type: StorageFill + contents: + - id: SheetUranium + +- type: entity + parent: CrateGenericSteel + id: CrateMaterialBasicResourceBulk + name: bulk basic sheet crate + description: 90 sheets of steel, glass, and plastic. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: SheetSteel + amount: 3 + - id: SheetGlass + amount: 3 + - id: SheetPlastic + amount: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/medical.yml new file mode 100644 index 00000000000..6c167cac7dc --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/medical.yml @@ -0,0 +1,71 @@ +# SPDX-FileCopyrightText: 2025 ThatOneMoon +# +# SPDX-License-Identifier: AGPL-3.0-or-later + + +- type: entity + id: CrateEmergencyDefibrillator + parent: CrateMedical + name: emergency defibrillator crate + description: Crate that contains a defibrillator. + components: + - type: StorageFill + contents: + - id: Defibrillator + +- type: entity + id: CrateEmergencyMedipens + parent: CrateMedical + name: emergency medipens crate + description: Crate that contains six emergency medipens + components: + - type: StorageFill + contents: + - id: EmergencyMedipen + amount: 6 + +- type: entity + id: CrateMedicalEquipment + parent: CrateMedical + name: medical equipment crate + description: For treating big and small injuries alike, contains a medical belt and hud, health analyzer, basic topicals, medical mask and pair of gloves as well as the medical guidebooks. + components: + - type: StorageFill + contents: + - id: ClothingEyesHudMedical + - id: ClothingMaskSterile + - id: ClothingHandsGlovesNitrile + - id: BookChemicalCompendium + - id: BookMedicalReferenceBook + - id: ClothingBeltMedicalFilled + - id: EmergencyMedipen + - id: Syringe + - id: HandheldHealthAnalyzer + +- type: entity + id: CrateMedicalParamedEquipment + parent: CrateMedicalSecure + name: paramedic equipment crate + description: Contains a paramedic void suit, set of air tanks, medical hud, EMT belt and a jet injector, Reqiuires Medical access to to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitVoidParamed + - id: ClothingBeltMedicalEMTFilled + - id: ClothingEyesHudMedical + - id: HandheldGPSBasic + - id: JetInjector + - id: ClothingHandsGlovesLatex + - id: ClothingMaskSterile + - id: NitrogenTank + - id: OxygenTank + +- type: entity + id: CrateMedicalBiomass + parent: CrateMedical + name: biomass crate + description: Crate that contains 100 units of biomass. + components: + - type: StorageFill + contents: + - id: MaterialBiomass \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/service.yml new file mode 100644 index 00000000000..beff369ad62 --- /dev/null +++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/service.yml @@ -0,0 +1,21 @@ + +- type: entity + id: CrateServiceColoredLightTubes + parent: CratePlastic + name: colored lightube box + description: Contains a set of diffrent colored light tubes. + components: + - type: StorageFill + contents: + - id: BoxLightTubeColored + +- type: entity + id: CrateServiceColoredLightBulb + parent: CratePlastic + name: colored lightbulb box + description: Contains a set of diffrent colored light bulbs. + components: + - type: StorageFill + contents: + - id: BoxLightBulbColored + diff --git a/forky-station - Shortcut.lnk b/forky-station - Shortcut.lnk new file mode 100644 index 00000000000..feaa48f33e0 Binary files /dev/null and b/forky-station - Shortcut.lnk differ