From c39a0690488a4024946607aa8de0868e23718a9f Mon Sep 17 00:00:00 2001 From: DVDPlayerOfDiscordFame Date: Sat, 18 Jan 2025 13:38:22 -0800 Subject: [PATCH 1/4] Firearms Upkeep adding #imp to the changes I made to the vanilla firearms, additions to the secfab, and research items. Included is a description change for the Captain's Laser, as well as a fix for the Mosin's speedloader to use the correct ammunition. --- .../Guns/Ammunition/Magazines/light_rifle.yml | 8 ++-- .../Ammunition/Projectiles/caseless_rifle.yml | 2 +- .../Ammunition/Projectiles/heavy_rifle.yml | 4 +- .../Ammunition/Projectiles/light_rifle.yml | 10 ++--- .../Guns/Ammunition/Projectiles/rifle.yml | 10 ++--- .../Ammunition/SpeedLoaders/rifle_light.yml | 6 +-- .../Weapons/Guns/Battery/battery_guns.yml | 4 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 8 ++-- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 +- .../Weapons/Guns/Revolvers/revolvers.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 20 ++++----- .../Objects/Weapons/Guns/SMGs/smgs.yml | 6 +-- .../Weapons/Guns/Shotguns/shotguns.yml | 10 ++--- .../Objects/Weapons/Guns/Snipers/snipers.yml | 14 +++---- .../Entities/Structures/Machines/lathe.yml | 42 +++++++++---------- Resources/Prototypes/Research/arsenal.yml | 4 +- 17 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 8d1df601efb0..e786e61ffa3a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -14,7 +14,7 @@ tags: - CartridgeLightRifle proto: CartridgeLightRifle - capacity: 23 + capacity: 23 #imp - type: Item size: Small - type: ContainerContainer @@ -36,7 +36,7 @@ # Magazines - type: entity id: MagazineLightRifleBox - name: "L6 SAW magazine box (.20 rifle)" + name: "L6 SAW magazine box (.20 rifle)" #imp parent: BaseMagazineLightRifle components: - type: Tag @@ -45,8 +45,8 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeRifle - proto: CartridgeRifle + - CartridgeRifle #imp + proto: CartridgeRifle #imp capacity: 100 - type: Item - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index ccb88c0b4f89..2a3e3fb357bc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 21 + Piercing: 21 #imp - type: entity id: BulletCaselessRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index d37555c3443a..1dc11cb34c05 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -1,13 +1,13 @@ - type: entity id: BulletHeavyRifle - name: bullet (.20 rifle) + name: bullet (.20 rifle) #imp parent: BaseBullet categories: [ HideSpawnMenu ] components: - type: Projectile damage: types: - Piercing: 19 + Piercing: 19 #imp - type: entity id: BulletMinigun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 4e151a94544a..0a3231637891 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 25 + Piercing: 25 #imp - type: entity id: BulletLightRiflePractice @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 6 - Heat: 19 + Blunt: 6 #imp + Heat: 19 #imp - type: entity id: BulletLightRifleUranium @@ -41,5 +41,5 @@ - type: Projectile damage: types: - Radiation: 12 - Piercing: 13 + Radiation: 12 #imp + Piercing: 13 #imp diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index d2ef34e79d97..908cb5516d27 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 19 + Piercing: 19 #imp - type: entity id: BulletRiflePractice @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 16 + Blunt: 3 #imp + Heat: 16 #imp - type: entity id: BulletRifleUranium @@ -41,6 +41,6 @@ - type: Projectile damage: types: - Radiation: 8 - Piercing: 9 + Radiation: 8 #imp + Piercing: 9 #imp diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml index 71b1119267db..5ce56470e22b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml @@ -1,6 +1,6 @@ - type: entity id: SpeedLoaderLightRifle - name: "speed loader (.30 rifle)" + name: "speed loader (.20 rifle)" #imp parent: [ BaseItem, BaseRestrictedContraband ] components: - type: Tag @@ -11,9 +11,9 @@ mayTransfer: true whitelist: tags: - - CartridgeLightRifle + - CartridgeRifle #imp capacity: 5 - proto: CartridgeLightRifle + proto: CartridgeRifle #imp - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi layers: 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 0e1dc518bc15..ae19c99d078e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -476,7 +476,7 @@ name: disabler SMG parent: [ BaseWeaponBattery, BaseRestrictedContraband ] id: WeaponDisablerSMG - description: Advanced weapon that exhausts organic targets, weakening them until they collapse. + description: An advanced weapon that exhausts organic targets, weakening them until they collapse. #imp components: - type: Item size: Large @@ -549,7 +549,7 @@ name: antique laser pistol parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] id: WeaponAntiqueLaser - description: All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. + description: An expertly hand-crafted weapon, finely decorated with leather and chrome; its frame hums with a menacing energy in your grip. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 44b251e8e766..443fb341490b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -51,7 +51,7 @@ - MagazineLightRifleBox gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: CartridgeRifle #imp priority: 1 whitelist: tags: @@ -69,7 +69,7 @@ name: L6 SAW id: WeaponLightMachineGunL6 parent: [BaseWeaponLightMachineGun, Tier3Contraband] - description: A rather traditionally-made Squad Automatic Weapon with a pleasantly lacquered wooden pistol grip. Lacks an LMG stock, decreasing controllability. Uses .20 rifle ammo. + description: A rather traditionally-made Squad Automatic Weapon with a pleasantly lacquered wooden pistol grip. Lacks an LMG stock, decreasing controllability. Uses .20 rifle ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi @@ -88,7 +88,7 @@ name: L6C ROW id: WeaponLightMachineGunL6C parent: BaseItem - description: An L6 SAW for use by cyborgs. Creates .20 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. + description: An L6 SAW for use by cyborgs. Creates .20 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. #imp components: - type: Gun minAngle: 4 @@ -116,7 +116,7 @@ containers: ballistic-ammo: !type:Container - type: ProjectileBatteryAmmoProvider - proto: CartridgeRifle + proto: CartridgeRifle #imp fireCost: 100 - type: Battery maxCharge: 10000 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index f79d7c0bad1d..15b961044079 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -24,7 +24,7 @@ name: china lake parent: [BaseWeaponLauncher, BaseGunWieldable, Tier3Contraband] id: WeaponLauncherChinaLake - description: THOOMP. + description: THOOMP. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 765d6f1ecb14..f660e5ddf409 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -140,7 +140,7 @@ name: cobra parent: [ BaseWeaponPistol, Tier3Contraband ] id: WeaponPistolCobra - description: A rugged, integrally-suppressed handgun. Perfect for the robust operator who wants to leave no trace. Uses .25 caseless ammo. + description: A rugged, integrally-suppressed handgun. Perfect for the robust operator who wants to leave no trace. Uses .25 caseless ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/cobra.rsi @@ -189,7 +189,7 @@ name: mk 58 parent: [BaseWeaponPistol, BaseRestrictedContraband] id: WeaponPistolMk58 - description: A cheap, ubiquitous sidearm produced by a NanoTrasen subsidiary. It does its job without any hassle. Uses .35 auto ammo. + description: A cheap, ubiquitous sidearm produced by a NanoTrasen subsidiary. It does its job without any hassle. Uses .35 auto ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/mk58.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 6f2f194f1102..65f0a814f88a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -97,7 +97,7 @@ name: Mateba parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded deathsquads... allegedly. Uses .45 magnum ammo. + description: The iconic sidearm of the dreaded deathsquads... allegedly. Uses .45 magnum ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 0a90aa18aa58..e7f211178a7d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -55,7 +55,7 @@ name: AKMS parent: [BaseWeaponRifle, BaseRestrictedContraband] id: WeaponRifleAk - description: An iconic weapon of war. Simple and effective; favored by revolutionaries everywhere. Uses .30 rifle ammo. + description: An iconic weapon of war. Simple and effective; favored by revolutionaries everywhere. Uses .30 rifle ammo. #imp components: - type: Sprite sprite: _Impstation/Objects/Weapons/Guns/Rifles/ak.rsi @@ -65,11 +65,11 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Gun - minAngle: 22 - maxAngle: 42 - angleIncrease: 3 - angleDecay: 18 - fireRate: 3.75 + minAngle: 22 #imp + maxAngle: 42 #imp + angleIncrease: 3 #imp + angleDecay: 18 #imp + fireRate: 3.75 #imp soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - type: ChamberMagazineAmmoProvider @@ -152,7 +152,7 @@ name: Lecter parent: [BaseWeaponRifle, BaseRestrictedContraband] id: WeaponRifleLecter - description: A modern short-barreled assault rifle fielded by militaries and law enforcement throughout many worlds, complete with familiar controls and ergonomics. Uses .20 rifle ammo. + description: A modern short-barreled assault rifle fielded by militaries and law enforcement throughout many worlds, complete with familiar controls and ergonomics. Uses .20 rifle ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/lecter.rsi @@ -164,11 +164,11 @@ - type: Clothing sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - type: Gun - fireRate: 4.5 + fireRate: 4.5 #imp selectedMode: FullAuto availableModes: - FullAuto - - SemiAuto + - SemiAuto #imp soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots @@ -204,7 +204,7 @@ name: Foam Force Astro Ace parent: [BaseWeaponShotgun, BaseGunWieldable] id: WeaponRifleFoam - description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy. The body crackles when you squeeze too tightly. + description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy. The body crackles when you squeeze too tightly. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index d7943340d37a..c112fc3701ae 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -85,7 +85,7 @@ name: C-20r submachine gun parent: [BaseWeaponSubMachineGun, Tier3Contraband] id: WeaponSubMachineGunC20r - description: An SMG often used by the infamous Nuclear Operatives... allegedly. Automatically ejects empty magazines. Uses .35 auto ammo. + description: An SMG often used by the infamous Nuclear Operatives... allegedly. Automatically ejects empty magazines. Uses .35 auto ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/c20r.rsi @@ -123,7 +123,7 @@ name: Drozd parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] id: WeaponSubMachineGunDrozd - description: A standard burst-fire two-handed submachine gun. Uses .35 auto ammo. + description: A standard burst-fire two-handed submachine gun. Uses .35 auto ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/drozd.rsi @@ -227,7 +227,7 @@ - type: entity name: WT550 parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ] - id: WeaponSubMachineGunWt550 + id: WeaponSubMachineGunWt550 #imp, but not for the ID... for the description!! Notepad++ is mad and won't let me comment after the description. description: An excellent top-loaded, compact Personal Defense Weapon, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index f1a1f1d8f680..56f2b7cf6f64 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -48,7 +48,7 @@ # Don't parent to BaseWeaponShotgun because it differs significantly parent: [BaseItem, BaseGunWieldable, Tier3Contraband] id: WeaponShotgunBulldog - description: A fully-automatic magazine-fed assault shotgun designed for close-quarters combat. This will get the job done. Uses .50 shotgun shells. + description: A fully-automatic magazine-fed assault shotgun designed for close-quarters combat. This will get the job done. Uses .50 shotgun shells. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi @@ -105,7 +105,7 @@ name: double-barreled shotgun parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorSecurityCivilianContraband] id: WeaponShotgunDoubleBarreled - description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells. + description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi @@ -128,7 +128,7 @@ name: double-barreled shotgun parent: WeaponShotgunDoubleBarreled id: WeaponShotgunDoubleBarreledRubber - description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells. + description: An immortal classic of the American Frontier, whatever that is. Uses .50 shotgun shells. #imp suffix: Non-Lethal components: - type: BallisticAmmoProvider @@ -138,7 +138,7 @@ name: Enforcer parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] id: WeaponShotgunEnforcer - description: A premium semi-automatic combat shotgun, featuring a pistol grip and full-length magazine tube for those nasty close-quarters engagements. Uses .50 shotgun shells. + description: A premium semi-automatic combat shotgun, featuring a pistol grip and full-length magazine tube for those nasty close-quarters engagements. Uses .50 shotgun shells. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi @@ -160,7 +160,7 @@ name: Kammerer parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] id: WeaponShotgunKammerer - description: Even centuries after his time, the legacy of John Moses Browning lives on. This pump-action shotgun is a favorite of hunters and militia forces throughout many worlds. Uses .50 shotgun shells. + description: Even centuries after his time, the legacy of John Moses Browning lives on. This pump-action shotgun is a favorite of hunters and militia forces throughout many worlds. Uses .50 shotgun shells. #imp components: - type: Item size: Normal diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 2e2f469c1ef2..48cc482cd1d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -27,7 +27,7 @@ path: /Audio/Weapons/Guns/Gunshots/sniper.ogg - type: BallisticAmmoProvider capacity: 10 - proto: CartridgeRifle + proto: CartridgeRifle #imp whitelist: tags: - CartridgeRifle @@ -41,7 +41,7 @@ - type: entity name: Kardashev-Mosin parent: [BaseWeaponSniper, BaseGunWieldable, Tier3Contraband] - id: WeaponSniperMosin + id: WeaponSniperMosin #imp for the description. Something about long descriptions I guess. description: A weapon for hunting, or endless trench warfare. There's a bayonet at the end, and the heft of the rifle could do some damage. Uses .20 rifle ammo. # Melee and gun components don't play nice; description will change when fixed. Melee components also disabled for the time being components: @@ -63,13 +63,13 @@ # animation: WeaponArcThrust # soundHit: # path: /Audio/Weapons/bladeslice.ogg - - type: EmbeddableProjectile + - type: EmbeddableProjectile #imp offset: -0.15,0.0 sound: /Audio/Weapons/star_hit.ogg - - type: ThrowingAngle + - type: ThrowingAngle #imp angle: 225 - - type: LandAtCursor - - type: DamageOtherOnHit + - type: LandAtCursor #imp + - type: DamageOtherOnHit #imp damage: types: Piercing: 15 @@ -85,7 +85,7 @@ name: Hristov parent: [BaseWeaponSniper, BaseGunWieldable, Tier3Contraband] id: WeaponSniperHristov - description: A portable anti-materiel rifle, originally intended for destroying the engine blocks of moving vehicles. Uses .60 anti-materiel ammo. + description: A portable anti-materiel rifle, originally intended for destroying the engine blocks of moving vehicles. Uses .60 anti-materiel ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ae85e790cc9f..22c4dc2b50f4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -387,11 +387,11 @@ - MagazineBoxPistolUranium - MagazineBoxRifleIncendiary - MagazineBoxRifleUranium - - MagazineDMRIncendiary - - MagazineDMRUranium + - MagazineDMRIncendiary #imp + - MagazineDMRUranium #imp - MagazineGrenadeEmpty - - MagazineLPistolIncendiary - - MagazineLPistolUranium + - MagazineLPistolIncendiary #imp + - MagazineLPistolUranium #imp - MagazineLightRifleIncendiary - MagazineLightRifleUranium - MagazinePistolIncendiary @@ -733,19 +733,19 @@ - MagazineBoxLightRiflePractice - MagazineBoxMagnum - MagazineBoxMagnumPractice - - MagazineBoxLPistol - - MagazineBoxLPistolPractice + - MagazineBoxLPistol #imp + - MagazineBoxLPistolPractice #imp - MagazineBoxPistol - MagazineBoxPistolPractice - MagazineBoxRifle - MagazineBoxRiflePractice - - MagazineDMR - - MagazineDMREmpty + - MagazineDMR #imp + - MagazineDMREmpty #imp - MagazineLightRifle - MagazineLightRifleEmpty - - MagazineLPistol - - MagazineLPistolEmpty - - MagazineLPistolPractice + - MagazineLPistol #imp + - MagazineLPistolEmpty #imp + - MagazineLPistolPractice #imp - MagazinePistol - MagazinePistolEmpty - MagazinePistolSubMachineGun @@ -784,21 +784,21 @@ - HyperBurstConversionKit - MagazineBoxLightRifleIncendiary - MagazineBoxLightRifleUranium - - MagazineBoxLPistolIncendiary - - MagazineBoxLPistolUranium + - MagazineBoxLPistolIncendiary #imp + - MagazineBoxLPistolUranium #imp - MagazineBoxMagnumIncendiary - MagazineBoxMagnumUranium - MagazineBoxPistolIncendiary - MagazineBoxPistolUranium - MagazineBoxRifleIncendiary - MagazineBoxRifleUranium - - MagazineDMRIncendiary - - MagazineDMRUranium + - MagazineDMRIncendiary #imp + - MagazineDMRUranium #imp - MagazineGrenadeEmpty - MagazineLightRifleIncendiary - MagazineLightRifleUranium - - MagazineLPistolIncendiary - - MagazineLPistolUranium + - MagazineLPistolIncendiary #imp + - MagazineLPistolUranium #imp - MagazinePistolIncendiary - MagazinePistolUranium - MagazineRifleIncendiary @@ -870,12 +870,12 @@ - MagazineBoxMagnum - MagazineBoxPistol - MagazineBoxRifle - - MagazineDMR - - MagazineDMREmpty + - MagazineDMR #imp + - MagazineDMREmpty #imp - MagazineLightRifle - MagazineLightRifleEmpty - - MagazineLPistol - - MagazineLPistolEmpty + - MagazineLPistol #imp + - MagazineLPistolEmpty #imp - MagazinePistol - MagazinePistolEmpty - MagazineRifle diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a1babf8eaef5..c5be3c0761ee 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -78,12 +78,12 @@ cost: 7500 recipeUnlocks: - MagazineRifleUranium - - MagazineLPistolUranium + - MagazineLPistolUranium #imp - MagazinePistolUranium - MagazineDMRUranium - MagazineLightRifleUranium - SpeedLoaderMagnumUranium - - MagazineBoxLPistolUranium + - MagazineBoxLPistolUranium #imp - MagazineBoxPistolUranium - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium From 8f531bba14f38bc31fa71994375829925592a169 Mon Sep 17 00:00:00 2001 From: DVDPlayerOfDiscordFame Date: Tue, 21 Jan 2025 10:39:22 -0800 Subject: [PATCH 2/4] Everything Tested I moved the #imp comments I wasn't confident wouldn't show up in the examine description back to the description and tested. None of the vanilla weapons have #imp in their descriptions and the speedloader fix works. --- .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index c112fc3701ae..f8d8a4471659 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -227,8 +227,8 @@ - type: entity name: WT550 parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ] - id: WeaponSubMachineGunWt550 #imp, but not for the ID... for the description!! Notepad++ is mad and won't let me comment after the description. - description: An excellent top-loaded, compact Personal Defense Weapon, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. + id: WeaponSubMachineGunWt550 + description: An excellent top-loaded, compact Personal Defense Weapon, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/SMGs/wt550.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 48cc482cd1d7..15c89d4f3d87 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -41,8 +41,8 @@ - type: entity name: Kardashev-Mosin parent: [BaseWeaponSniper, BaseGunWieldable, Tier3Contraband] - id: WeaponSniperMosin #imp for the description. Something about long descriptions I guess. - description: A weapon for hunting, or endless trench warfare. There's a bayonet at the end, and the heft of the rifle could do some damage. Uses .20 rifle ammo. + id: WeaponSniperMosin + description: A weapon for hunting, or endless trench warfare. There's a bayonet at the end, and the heft of the rifle could do some damage. Uses .20 rifle ammo. #imp # Melee and gun components don't play nice; description will change when fixed. Melee components also disabled for the time being components: - type: Gun From 87135a821b9eab6204c4ff63ba4e9d1be448a7b4 Mon Sep 17 00:00:00 2001 From: DVDPlayerOfDiscordFame Date: Tue, 21 Jan 2025 17:56:53 -0800 Subject: [PATCH 3/4] Edits Requested edits. --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ae19c99d078e..82cf7ec2a562 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -549,7 +549,7 @@ name: antique laser pistol parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] id: WeaponAntiqueLaser - description: An expertly hand-crafted weapon, finely decorated with leather and chrome; its frame hums with a menacing energy in your grip. #imp + description: All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 65f0a814f88a..46fe19a8d45a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -97,7 +97,7 @@ name: Mateba parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded deathsquads... allegedly. Uses .45 magnum ammo. #imp + description: The iconic sidearm of the dreaded death squads... allegedly. Uses .45 magnum ammo. #imp components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi From d381f7e247f7b96934c95658232fa3ac8e45e3ff Mon Sep 17 00:00:00 2001 From: DVDPlayerOfDiscordFame Date: Tue, 21 Jan 2025 18:13:30 -0800 Subject: [PATCH 4/4] Some final changes Wizden doesn't proofread and I'm fixing consistency with weapon name capitalizations. Probably not all of them but a lot of them are done here. Also fixing my own weapon name capitalizations. The fake Golden Zipper's name being all lowercase still is intentional. --- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 10 +++++----- .../Objects/Weapons/Guns/Battery/goldzipper.yml | 2 +- .../Objects/Weapons/Guns/LightPistols/Lpistols.yml | 6 +++--- .../Entities/Objects/Weapons/Guns/Rifles/dmr.yml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index f660e5ddf409..0a71088ad7fd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -69,7 +69,7 @@ price: 500 - type: entity - name: viper + name: Viper parent: [BaseWeaponPistol, Tier3Contraband] id: WeaponPistolViper description: A small, easily-concealable but somewhat underpowered handgun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. @@ -102,10 +102,10 @@ gun_chamber: !type:ContainerSlot - type: entity - name: echis + name: Echis parent: [ BaseItem, Tier3Contraband ] id: WeaponPistolEchis - description: A viper pistol for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. + description: A Viper pistol for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. components: - type: Gun fireRate: 5 @@ -137,7 +137,7 @@ - type: AmmoCounter - type: entity - name: cobra + name: Cobra parent: [ BaseWeaponPistol, Tier3Contraband ] id: WeaponPistolCobra description: A rugged, integrally-suppressed handgun. Perfect for the robust operator who wants to leave no trace. Uses .25 caseless ammo. #imp @@ -186,7 +186,7 @@ gun_chamber: !type:ContainerSlot - type: entity - name: mk 58 + name: Mk 58 parent: [BaseWeaponPistol, BaseRestrictedContraband] id: WeaponPistolMk58 description: A cheap, ubiquitous sidearm produced by a NanoTrasen subsidiary. It does its job without any hassle. Uses .35 auto ammo. #imp diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/goldzipper.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/goldzipper.yml index 52e8fc804470..1115020100bd 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/goldzipper.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/goldzipper.yml @@ -1,5 +1,5 @@ - type: entity - name: golden zipper + name: Golden Zipper parent: WeaponDisablerPractice id: WeaponGoldZipper description: Legends tell of a gun that can kill anything with a single shot. diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/LightPistols/Lpistols.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/LightPistols/Lpistols.yml index c78e1606ad78..68d21f3453a2 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/LightPistols/Lpistols.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/LightPistols/Lpistols.yml @@ -1,5 +1,5 @@ - type: entity - name: mk 93 + name: Mk 93 parent: [ BaseWeaponPistol, BaseRestrictedContraband ] id: WeaponPistolMk93 description: A cheap pistol built for fully automatic fire. Uses .22 auto ammo. @@ -48,7 +48,7 @@ node: convert-fullauto - type: entity - name: mk 92hb + name: Mk 92HB parent: [ BaseWeaponPistol, BaseRestrictedContraband ] id: WeaponPistolMk92HB description: Designed in an attempt to make the most of a small cartridge. Uses .22 auto ammo. @@ -100,7 +100,7 @@ node: convert-hyperburst - type: entity - name: zipper .22 + name: Zipper .22 parent: [ BaseWeaponPistol, BaseRestrictedContraband ] id: WeaponPistolZipper description: Better at delivering the killing blow to the business of its manufacturer than to its actual targets. Uses .22 auto ammo. diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Rifles/dmr.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Rifles/dmr.yml index 1a865555049d..adffbb2980a6 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Rifles/dmr.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Rifles/dmr.yml @@ -1,5 +1,5 @@ - type: entity - name: daito + name: Daito parent: [BaseWeaponRifle, BaseRestrictedContraband] id: WeaponRifleDaito description: A military precision rifle for the efficient combatant. Uses .30 rifle ammo. @@ -60,7 +60,7 @@ - type: Appearance - type: entity - name: nemesis-11 + name: Nemesis-11 parent: [BaseWeaponRifle, BaseSyndicateContraband] id: WeaponRifleNemesis description: An ambitious step into the future of firearms, and no less fearful. Uses .25 caseless ammo.