diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index a45924fd4c5..af29af77b01 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -46,8 +46,6 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - - type: StaticPrice - price: 210 - type: entity name: Hristov diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml new file mode 100644 index 00000000000..e84798b6ccf --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/event.yml @@ -0,0 +1,289 @@ +- type: entity + id: RandomLootLegal + name: Random Loot Legal + suffix: Spawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bedsheets.rsi + state: sheetUSA + - type: RandomSpawner + prototypes: + - WeaponRevolverArgenti + - CombatKnife + - WeaponPistolMk58 + - WeaponLaserGun + - WeaponRifleBB + - ClothingOuterArmorCult + - ClothingOuterArmorHeavyRed + - ClothingOuterArmorHeavyGreen + - ClothingOuterArmorHeavy + - ChemDispenserMachineCircuitboard + - RiotBulletShield + - MakeshiftShield + - RiotLaserShield + - RiotShield + - WebShield + - FlatpackerMachineCircuitboard + - WeaponGauntletGorilla + - ClothingHeadHatHetmanHat + - MonkeyCubeBox + - ShipyardRCD + - MedkitToxinFilled + - MedkitRadiationFilled + - MedkitBurnFilled + - MedkitOxygenFilled + - MedkitFilled + - ResearchAndDevelopmentServerMachineCircuitboard + - CableApcStack + - BoxMRE + - FoodTinPeachesMaint + - CigCartonBlack + - RPED + - ClothingHeadAreopagite + - ClothingOuterHardsuitAtmos + - ClothingBackpackWaterTank + - ClothingBeltBandolier + - BaseBallBat + - ClothingOuterHardsuitBasic + - Bible + - BikeHornImplanter + - BoxHugHealing + - ClothingOuterHardsuitEngineeringWhite + - ClothingOuterHardsuitMedical + - ClaymoreDulled + - ClothingOuterHardsuitClown + - WeaponShotgunDoubleBarreled + - ClothingHandsGlovesCombat + - ClothingOuterHardsuitEngineering + - HandHeldMassScanner + - BoxPerformer + - HolofanProjector + - JetpackBlueFilled + - KatanaDulled + - LightImplanter + - ClothingOuterHardsuitLuxury + - WeaponMakeshiftLaser + - MedicalTrackingImplanter + - MedicalTechFabCircuitboard + - MegaSprayBottle + - JetpackMiniFilled + - ClothingOuterHardsuitSalvage + - WeaponPistolMk58 + - WeaponPistolMk58Nonlethal + - MothroachCube + - PlasteelArmingSword + - SheetPlastic + - WeaponShotgunSawnNonlethal + - WeaponShotgunSawn + - ScienceTechFabCircuitboard + - ServiceTechFabCircuitboard + - SheetifierMachineCircuitboard + - ShredderMachineCircuitboard + - Sledgehammer + - ClothingOuterHardsuitSpatio + - WeaponLaserSvalinn + - TechnologyDisk + - ClothingHeadHelmetTemplar + - SheetUranium + - ClothingNeckCloakVoid + - BoxHandcuff + - ResearchDisk5000 + - ResearchDisk + - WeaponRevolverDeckardNonlethal + - ToySword + - HypoMini + - ClothingHeadHatCatEars + - ClothingOuterVestWeb + - ClothingBackpackDuffelSyndicateBundleSamurai + - FoodPizzaArnold + - SadTromboneImplanter + chance: 1 + rarePrototypes: + - ClothingBeltSheathFilled + - WeaponShotgunKammerer + - WeaponForceGun + - ClothingOuterArmorPodWars + - ClothingHeadHelmetPodWars + - ClockworkShield + - MirrorShield + - HypoMiniLimitedEdition + - MedkitCombatFilled + - WeaponAdvancedLaser + - AmmoTechFabCircuitboard + - PlushieArachind + - ClothingMaskArcadia + - ClothingBeltChiefEngineerFilled + - CowToolboxFilled + - ClothingShoesBootsMagCombatFilled + - ClothingShoesBootsMagGaloshes + - Hypospray + - Katana + - WeaponLaserCannon + - MuteToxinChemistryBottle + - ClothingOuterHardsuitCap + - ClothingShoesBootsMagBlinding + - WeaponRevolverDeckard + - Claymore + - TelescopicShield + - MedkitAdvancedFilled + - FireAxe + - ClothingShoesGaloshes + - Kanabou + - EnergyShield + rareChance: 0.1 + +- type: entity + id: RandomRarelegalLoot + name: Random Rare Legal Loot + suffix: Spawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bedsheets.rsi + state: sheetUSA + - type: RandomSpawner + prototypes: + - ClothingBeltSheathFilled + - SpaceCash10000 + - WeaponForceGun + - ClothingOuterArmorPodWars + - ClothingHeadHelmetPodWars + - ClothingOuterCoatSpaceAsshole + - UnholyHalberd + - ClockworkShield + - MirrorShield + - HypoMiniLimitedEdition + - MedkitCombatFilled + - WeaponAdvancedLaser + - ClothingMaskArcadia + - ClothingShoesBootsMagCombatFilled + - WeaponLaserCannon + - PowerCellMicroreactor + - MuteToxinChemistryBottle + - SmokeGrenade + - ClothingShoesBootsMagBlinding + - TechnologyDiskRare + - Truncheon + - ResearchDisk10000 + - FoodPizzaArnold + - MedkitAdvancedFilled + - FireAxe + - ClothingShoesGaloshes + - Kanabou + - EnergyShield + - ClothingBackpackDuffelSyndicateCostumeClown + + +- type: entity + id: RandomEventIllegalLoot + name: Random Illegal Loot + suffix: Spawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Misc/bedsheets.rsi + state: sheetsyndie + - type: RandomSpawner + prototypes: + - DnaScramblerImplanter + - CyberPen + - CigPackSyndicate + - ClothingEyesGlassesOutlawGlasses + - SyndicatePersonalAI + - EnergySword + - WeaponPistolCobra + - EmpGrenade + - Stimpack + - ClusterGrenade + - SyndieMiniBomb + - PenExplodingBox + - GrenadeShrapnel + - GrenadeIncendiary + - ExGrenade + - C4 + - SmokeGrenade + - GrenadeFlashBang + - ClothingShoesBootsMagSyndie + - ClothingBackpackDuffelSyndicateEVABundle + - ClothingUniformJumpskirtOperative + - ClothingNeckScarfStripedSyndieGreen + - ClothingUniformJumpsuitOperative + - ClothingHandsGlovesBoxingRigged + - ScramImplanter + - StorageImplanter + - ClothingHeadHatOutlawHat + - RubberStampSyndicate + - ClothingBackpackDuffelSyndicatePyjamaBundle + - ClothingBackpackDuffelSyndicateCarpSuit + - EnergyDagger + - RevolverCapGun + - BalloonSyn + - RadioJammer + - SoapSyndie + - BoxEncryptionKeySyndie + - ClothingHeadsetAltSyndicate + - HappyHonkNukieSnacks + - NukeDiskFake + - LanternFlash + - CrateFunSyndicateSegway + - SlipocalypseClusterSoap + - BriefcaseSyndieLobbyingBundleFilled + - Emag + - BorgModuleSyndicateWeapon + - ClothingOuterHardsuitSyndie + - ClothingOuterHardsuitSyndieMedic + - WeaponRifleAk + - WeaponRifleLecter + - WeaponPistolCHIMPUpgradeKit + - WeaponSniperHristov + - WeaponLauncherPirateCannon + - ClothingHeadHelmetSwatSyndicate + - ClothingShoesBootsWinterSyndicate + - ClothingBeltMilitaryWebbingMedFilled + - WeaponShotgunEnforcer + chance: 1 + rarePrototypes: + - ClothingBackpackDuffelSyndicateFilledGrenadeLauncher + - StealthBox + - ClothingBackpackDuffelSyndicateFilledEmpGrenadeLauncher + - ClothingBackpackDuffelSyndicateFilledLMG + - ClothingBackpackDuffelSyndicateFilledShotgun + - ClothingBackpackDuffelSyndicateFilledSMG + - BriefcaseSyndieSniperBundleFilled + - ElectricalDisruptionKit + - ChemicalSynthesisKit + - ClothingOuterHardsuitSyndieElite + - EmpImplanter + - ClothingBackpackChameleonFill + - NocturineChemistryBottle + - ThievingGloves + - ScramImplanter + - ClothingOuterHardsuitJuggernaut + - WeaponPistolViper + - WhiteholeGrenade + - FireAxeFlaming + - ClothingMaskGasVoiceChameleon + - StimkitFilled + - AgentIDCard + - HypopenBox + - ReinforcementRadioSyndicateMonkey + - HypoDartBox + - BoxHoloparasite + - ClothingHandsGlovesNorthStar + - FreedomImplanter + - EnergySwordDouble + - ClothingBackpackDuffelSyndicateC4tBundle + - HolyHandGrenade + - WeaponRevolverPythonAP + - CombatMedipen + - Emag + - SyndiHypo + - EnergyKatana + rarechance: .1 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml index 4c0e45a98a3..bce74cf9763 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: Arcadia Industries Shredder Spawner id: SpawnMobArcIndShredder parent: MarkerBase @@ -39,3 +39,132 @@ - type: ConditionalSpawner prototypes: - MobArcIndBlaster + +- type: entity + name: Salvager Spawner + id: SpawnMobSalvager + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: full + sprite: Mobs/Species/Human/parts.rsi + - type: ConditionalSpawner + prototypes: + - MobSalvager + +- type: entity + name: Laser Raptor Spawner + id: SpawnMobLaserRaptor + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: laser_raptor + sprite: Mobs/Aliens/laser_raptor.rsi + - type: ConditionalSpawner + prototypes: + - MobLaserRaptor + +- type: entity + name: RatKing Spawner + id: SpawnMobRatKing + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: icon + sprite: Mobs/Animals/regalrat.rsi + - type: ConditionalSpawner + prototypes: + - MobRatKing + +- type: entity + name: RatBuff Spawner + id: SpawnMobRatKingBuff + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: icon + sprite: Mobs/Animals/buffrat.rsi + - type: ConditionalSpawner + prototypes: + - MobRatKingBuff + +- type: entity + name: Abomination Spawner + id: SpawnMobAbomination + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: abomination + sprite: Mobs/Demons/abomination.rsi + - type: ConditionalSpawner + prototypes: + - MobAbomination + +- type: entity + name: Watcher Spawner + id: SpawnMobWatchers + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: unshaded + sprite: Mobs/Aliens/Lavaland/watcher.rsi + - type: ConditionalSpawner + prototypes: + - MobWatcherLavaland + - MobWatcherMagmawing + - MobWatcherIcewing + +- type: entity + name: KillerTomato Spawner + id: SpawnMobTomatoKillers + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: produce + sprite: Nyanotrasen/Mobs/Mutants/killer_tomato.rsi + - type: ConditionalSpawner + prototypes: + - MobTomatoKiller + +- type: entity + name: Dungeon SpaceDragon Spawner + id: SpawnDungeon SpaceDragon + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: alive + sprite: Mobs/Aliens/Carps/dragon.rsi + - type: ConditionalSpawner + prototypes: + - MobDragonDungeon + +- type: entity + name: Tarantula Spawner + suffix: Angry + id: SpawnTarantula + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: tarantula + sprite: Mobs/Animals/spider.rsi + - type: ConditionalSpawner + prototypes: + - MobGiantSpiderAngry diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index 0955471580d..126210e89a0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -36,3 +36,4 @@ - type: SpentAmmoVisuals state: emp suffix: false + diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 46a5c2a1c8f..0f03f958bbe 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -5,9 +5,9 @@ description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. components: - type: Sprite - sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi + sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Clothing - sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi + sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Gun fireRate: 2 resetOnHandSelected: false diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/bolt-open.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/equipped-BELT.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/meta.json