Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
id: UplinkPistolViper
name: uplink-pistol-viper-name
description: uplink-pistol-viper-desc
productEntity: WeaponPistolViper
productEntity: WeaponPistolViperSyndicate # Euphoria - Added Viper Variants
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
- suitStorage
- Belt
- type: Gun
fireRate: 6
fireRate: 5
selectedMode: SemiAuto
availableModes:
- SemiAuto
Expand Down Expand Up @@ -82,9 +82,9 @@

- type: entity
name: viper
parent: [BaseWeaponPistol, BaseSyndicateContraband]
parent: [BaseWeaponPistol, BaseSecurityContraband] # Euphoria
id: WeaponPistolViper
description: A common handgun illegally modified by the Syndicate. The Viper sports a selector switch between semi-auto and ‘rock and roll’. The standard sidearm for any soldier who fights under the three serpents. Feeds from .35 pistol magazines.
description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/viper.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@

- type: entity
name: Python
parent: [BaseWeaponRevolver, BaseSyndicateContraband]
parent: [BaseWeaponRevolver, BaseSecurityContraband] # Euphoria
id: WeaponRevolverPython
description: A powerful double-action revolver manufactured by the Syndicate. Loud and flashy, perfect for any agent looking to make a statement. Loads 6 rounds of .45 magnum.
description: An iconic large-framed revolver of ancient Sol' design. It is commonly manufactured by many companies all over the colonies. Uses .45 magnum ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/python.rsi
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Antags/nukeops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
belt: ClothingBeltMilitaryWebbing
storage:
back:
- WeaponPistolViper
- WeaponPistolViperSyndicate # Euphoria
- PinpointerSyndicateNuclear
# - DeathAcidifierImplanter # DeltaV - more TC less acid
- BionicVoiceMaskImplanter # DeltaV - Voice masking implant
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Roles/Antags/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
gloves: ClothingHandsGlovesColorBlack
storage:
back:
- WeaponPistolViper
- WeaponPistolViperSyndicate # Euphoria
- PinpointerSyndicateNuclear
- DeathAcidifierImplanter

Expand All @@ -54,7 +54,7 @@
id: SyndicateReinforcementMedic
parent: SyndicateOperativeClothing
equipment:
pocket1: WeaponPistolViper
pocket1: WeaponPistolViperSyndicate # Euphoria
inhand:
- MedkitCombatFilled

Expand All @@ -64,13 +64,13 @@
equipment:
id: AgentIDCard
mask: ClothingMaskGasVoiceChameleon
pocket1: WeaponPistolViper
pocket1: WeaponPistolViperSyndicate # Euphoria

- type: startingGear
id: SyndicateReinforcementThief
parent: SyndicateOperativeClothing
equipment:
pocket1: WeaponPistolViper
pocket1: WeaponPistolViperSyndicate # Euphoria
inhand:
- ToolboxSyndicateFilled
storage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
id: ArmsdealerViper
table: !type:AllSelector
children:
- id: WeaponPistolViper
- id: WeaponPistolViperSyndicate # Euphoria
amount: !type:RangeNumberSelector
range: 1, 2
- id: MagazinePistol
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Catalog/fugitive_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
sprite: Objects/Weapons/Guns/Pistols/viper.rsi
state: icon
content:
- WeaponPistolViper
- WeaponPistolViperSyndicate # Euphoria
- MagazinePistol
- BriefcaseBrown

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
name: viper
parent: BaseWeaponPistol
parent: WeaponPistolViper # Euphoria - Added Parent so the code is cleaner
id: WeaponPistolViperWood
description: A small, low-power pistol with pleasant lacquered wooden grips. Uses .35 auto ammo.
suffix: Wood
Expand All @@ -9,28 +9,6 @@
sprite: _DV/Objects/Weapons/Guns/Pistols/viperwood.rsi
- type: Clothing
sprite: _DV/Objects/Weapons/Guns/Pistols/viperwood.rsi
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistol
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePistol
gun_chamber:
name: Chamber
startingItem: CartridgePistol
priority: 1
whitelist:
tags:
- CartridgePistol
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot

- type: entity
name: Pollock
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Roles/Antags/nukeops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
shoes: ClothingShoesBootsCombatFilled
id: SyndiPDA
pocket1: WeaponDisabler
pocket2: WeaponPistolViper
pocket2: WeaponPistolViperSyndicate # Euphoria
belt: ClothingBeltMilitaryWebbingHostageWarden
storage:
back:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity # Syndicate Viper
name: viper
parent: [WeaponPistolViper, BaseSyndicateContraband]
id: WeaponPistolViperSyndicate
description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. This one has been modified for improved firerate. Uses .35 auto ammo.
components:
- type: Gun
fireRate: 6
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
- FloofWeaponLaserSvalinn
- FloofPlasteelArmingSword
- FloofWeaponEnergyGunMini
- FloofWeaponPistolViper
- FloofWeaponPistolViperWood
- FloofClothingBeltKatanaSheathFilled

- type: loadoutGroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
equipment:
pocket1: WeaponLaserSvalinn

- type: loadout
id: FloofWeaponPistolViper
equipment:
pocket1: WeaponPistolViper

- type: loadout
id: FloofWeaponPistolViperWood
equipment:
pocket1: WeaponPistolViperWood

# Ammo
- type: loadout
id: FloofSecurityFirearmMagazinePistolRubber
Expand Down
Loading