Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix gun sprites and names (#734)

Browse Source 
Addresses #606

Sprites fixed so no short versions used (for now) and some of the extra states were removed (clarissa).

When I originally PR'd pascal case wasn't the decided name so I also updated the IDs.
This commit is contained in:
metalgearsloth
2020-02-24 00:44:15 +11:00
committed by GitHub
parent 5ccdc0751a
commit 847acd6401
31 changed files with 257 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml
View File

@@ -1,7 +1,7 @@
- type: entity
name: BaseLMG
parent: BaseItem
id: lmg_base
id: LmgBase
description: A rooty tooty point and shooty.
abstract: true
components:
@@ -24,17 +24,17 @@
- type: entity
name: L6
parent: lmg_base
id: lmg_l6
parent: LmgBase
id: LmgL6
description: A rooty tooty point and shooty.
components:
- type: Sprite
netsync: false
sprite: Objects/Guns/LMGs/l6.rsi
state: l6-5
state: l6-4
- type: Icon
sprite: Objects/Guns/LMGs/l6.rsi
state: l6-5
state: l6-4
- type: RangedWeapon
spreadstddev: 30
automatic: true
@@ -48,24 +48,24 @@
visuals:
- type: BallisticMagazineWeaponVisualizer2D
base_state: l6
steps: 6
steps: 5
- type: Item
Size: 24
sprite: Objects/Guns/LMGs/l6.rsi
- type: entity
name: PK
parent: lmg_base
id: lmg_pk
parent: LmgBase
id: LmgPk
description: A rooty tooty point and shooty.
components:
- type: Sprite
netsync: false
sprite: Objects/Guns/LMGs/pk.rsi
state: pk-5
state: pk-4
- type: Icon
sprite: Objects/Guns/LMGs/pk.rsi
state: pk-5
state: pk-4
- type: RangedWeapon
spreadstddev: 10
automatic: true
@@ -79,7 +79,7 @@
visuals:
- type: BallisticMagazineWeaponVisualizer2D
base_state: pk
steps: 6
steps: 5
- type: Item
Size: 24
sprite: Objects/Guns/LMGs/pk.rsi

6
Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml
View File

@@ -1,7 +1,7 @@
- type: entity
name: Retro Laser Gun
parent: BaseItem
id: LaserItem
id: LaserGun
description: A weapon using light amplified by the stimulated emission of radiation. Ancient inefficient model.
components:
- type: Sprite
@@ -31,8 +31,8 @@
- type: entity
name: Laser Cannon
parent: LaserItem
id: LCannon
parent: LaserGun
id: LaserCannon
description: With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!
components:
- type: Sprite

70
Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml
View File

@@ -1,7 +1,7 @@
- type: entity
name: BasePistol
parent: BaseItem
id: pistol_base
id: PistolBase
description: A rooty tooty point and shooty.
abstract: true
components:
@@ -20,8 +20,8 @@
- type: entity
name: Clarissa
parent: pistol_base
id: pistol_clarissa
parent: PistolBase
id: PistolClarissa
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -52,8 +52,8 @@
- type: entity
name: Clarissa (Silenced)
parent: pistol_base
id: pistol_clarissa_s
parent: PistolBase
id: PistolClarissaS
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -84,8 +84,8 @@
- type: entity
name: Deagle
parent: pistol_base
id: pistol_deagle
parent: PistolBase
id: PistolDeagle
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -120,8 +120,8 @@
- type: entity
name: Deckard
parent: pistol_base
id: pistol_deckard
parent: PistolBase
id: PistolDeckard
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -155,8 +155,8 @@
- type: entity
name: Giskard
parent: pistol_base
id: pistol_giskard
parent: PistolBase
id: PistolGiskard
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -187,8 +187,8 @@
- type: entity
name: Giskard (Silenced)
parent: pistol_base
id: pistol_giskard_s
parent: PistolBase
id: PistolGiskardS
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -219,8 +219,8 @@
- type: entity
name: Gyro pistol
parent: pistol_base
id: pistol_gyro
parent: PistolBase
id: PistolGyro
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -256,8 +256,8 @@
- type: entity
name: IH machine pistol
parent: pistol_base
id: pistol_ihmp
parent: PistolBase
id: PistolIhmp
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -290,8 +290,8 @@
- type: entity
name: IH machine pistol (Silenced)
parent: pistol_base
id: pistol_ihmp_s
parent: PistolBase
id: PistolIhmpS
description: Pewsh pewsh
components:
- type: Sprite
@@ -324,8 +324,8 @@
- type: entity
name: IH sidearm
parent: pistol_base
id: pistol_ihsidearm
parent: PistolBase
id: PistolIhSidearm
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -357,8 +357,8 @@
- type: entity
name: IH sidearm (Silenced)
parent: pistol_base
id: pistol_ihsidearm_s
parent: PistolBase
id: PistolIhSidearmS
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -390,8 +390,8 @@
- type: entity
name: Lamia
parent: pistol_base
id: pistol_lamia
parent: PistolBase
id: PistolLamia
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -427,8 +427,8 @@
- type: entity
name: Makarov
parent: pistol_base
id: pistol_makarov
parent: PistolBase
id: PistolMakarov
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -459,8 +459,8 @@
- type: entity
name: Makarov (Silenced)
parent: pistol_base
id: pistol_makarov_s
parent: PistolBase
id: PistolMakarovS
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -491,8 +491,8 @@
- type: entity
name: Mk 58
parent: pistol_base
id: pistol_mk58
parent: PistolBase
id: PistolMk58
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -523,8 +523,8 @@
- type: entity
name: Mk 58 (Wood)
parent: pistol_base
id: pistol_mk58_w
parent: PistolBase
id: PistolMk58W
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -555,8 +555,8 @@
- type: entity
name: Olivaw civil
parent: pistol_base
id: pistol_olivawcivil
parent: PistolBase
id: PistolOlivawCivil
description: A rooty tooty point and shooty.
components:
- type: Sprite

52
Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml
View File

@@ -1,7 +1,7 @@
- type: entity
name: BaseRifle
parent: BaseItem
id: rifle_base
id: RifleBase
description: A rooty tooty point and shooty.
abstract: true
components:
@@ -19,17 +19,17 @@
- type: entity
name: AK
parent: rifle_base
id: rifle_ak
parent: RifleBase
id: RifleAk
description: A rooty tooty point and shooty.
components:
- type: Sprite
netsync: false
sprite: Objects/Guns/Rifles/ak.rsi
state: ak-1
state: ak-0
- type: Icon
sprite: Objects/Guns/Rifles/ak.rsi
state: ak-1
state: ak-0
- type: Sound
- type: RangedWeapon
spreadstddev: 2
@@ -45,24 +45,24 @@
visuals:
- type: BallisticMagazineWeaponVisualizer2D
base_state: ak
steps: 2
steps: 1
- type: Item
Size: 24
sprite: Objects/Guns/Rifles/ak.rsi
- type: entity
name: Black AK
parent: rifle_base
id: rifle_blackak
parent: RifleBase
id: RifleBlackAk
description: A rooty tooty point and shooty.
components:
- type: Sprite
netsync: false
sprite: Objects/Guns/Rifles/black-ak.rsi
state: black-ak-1
state: black-ak-0
- type: Icon
sprite: Objects/Guns/Rifles/black-ak.rsi
state: black-ak-1
state: black-ak-0
- type: Sound
- type: RangedWeapon
spreadstddev: 2
@@ -78,15 +78,15 @@
visuals:
- type: BallisticMagazineWeaponVisualizer2D
base_state: black-ak
steps: 2
steps: 1
- type: Item
Size: 24
sprite: Objects/Guns/Rifles/black-AK.rsi
- type: entity
name: Carbine
parent: rifle_base
id: rifle_carbine
parent: RifleBase
id: RifleCarbine
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -118,8 +118,8 @@
- type: entity
name: Dallas
parent: rifle_base
id: rifle_dallas
parent: RifleBase
id: RifleDallas
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -152,8 +152,8 @@
- type: entity
name: IH heavy rifle
parent: rifle_base
id: rifle_ihheavy
parent: RifleBase
id: RifleIhHeavy
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -186,8 +186,8 @@
- type: entity
name: Sol-EOT
parent: rifle_base
id: rifle_sol_eot
parent: RifleBase
id: RifleSolEot
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -221,8 +221,8 @@
- type: entity
name: Sol-Para
parent: rifle_base
id: rifle_sol_para
parent: RifleBase
id: RifleSolPara
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -256,17 +256,17 @@
- type: entity
name: STS
parent: rifle_base
id: rifle_sts
parent: RifleBase
id: RifleSts
description: A rooty tooty point and shooty.
components:
- type: Sprite
netsync: false
sprite: Objects/Guns/Rifles/sts.rsi
state: sts-1
state: sts-0
- type: Icon
sprite: Objects/Guns/Rifles/sts.rsi
state: sts-1
state: sts-0
- type: RangedWeapon
spreadstddev: 2
automatic: true
@@ -281,7 +281,7 @@
visuals:
- type: BallisticMagazineWeaponVisualizer2D
base_state: sts
steps: 2
steps: 1
- type: Item
Size: 24
sprite: Objects/Guns/Rifles/sts.rsi

26
Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml
View File

@@ -1,7 +1,7 @@
- type: entity
name: BaseSMG
parent: BaseItem
id: smg_base
id: SmgBase
description: A rooty tooty point and shooty.
abstract: true
components:
@@ -23,8 +23,8 @@
- type: entity
name: C-20r Sub Machine Gun
parent: smg_base
id: smg_c20r
parent: SmgBase
id: SmgC20r
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -54,8 +54,8 @@
- type: entity
name: IH SMG
parent: smg_base
id: smg_ihsmg
parent: SmgBase
id: SmgIhSmg
description: Pla-ket-ket-ket-ket
components:
- type: Sprite
@@ -86,8 +86,8 @@
- type: entity
name: IH SMG (Silenced)
parent: smg_base
id: smg_ihsmg_s
parent: SmgBase
id: SmgIhSmgS
description: Pewsh pewsh
components:
- type: Sprite
@@ -119,8 +119,8 @@
- type: entity
name: Mac
parent: smg_base
id: smg_mac
parent: SmgBase
id: SmgMac
description: Pla-ket-ket-ket-ket
components:
- type: Sprite
@@ -151,8 +151,8 @@
- type: entity
name: Saber
parent: smg_base
id: smg_saber
parent: SmgBase
id: SmgSaber
description: A rooty tooty point and shooty.
components:
- type: Sprite
@@ -183,8 +183,8 @@
- type: entity
name: WT550
parent: smg_base
id: smg_wt550
parent: SmgBase
id: SmgWt550
description: A rooty tooty point and shooty.
components:
- type: Sprite