Skip to content

Commit

Permalink
new_weapon_for_secr_upd1
Browse files Browse the repository at this point in the history
  • Loading branch information
unDepresh committed Aug 4, 2024
1 parent 09a19d8 commit ca151aa
Show file tree
Hide file tree
Showing 72 changed files with 332 additions and 64 deletions.
4 changes: 4 additions & 0 deletions Resources/Audio/Exodus/Weapons/HoSLaser/Atttribution.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["HoSLaser.ogg"]
license: "CC-BY03.0"
copyright: "Created by https://zvukogram.com"
source: "https://zvukogram.com/category/zvuki-lazera/"
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/Exodus/Weapons/MiniEnergyGun/Atttribution.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["MiniEnergyGun.ogg"]
license: "CC-BY03.0"
copyright: "Created by https://Zvukipro.com"
source: "https://zvukipro.com/oryjie/196-zvuki-blastera.html"
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-CrateSecurityMiniEnergyGun = Ящик с миниатюрными энергетическими пистолетами
.desc = Этот ящик содержит в себе два миниатюрных энергетических пистолетов. Для открытия требуется доступ службы безопасности
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-WeaponMiniEnergyGun = Миниатюрный энергетический пистолет
.desc = Небольшой энергетический пистолет со встроенным фонариком. У него есть две настройки; отключить и убить. Обычно выдается офицерам службы безопасности как табельное оружие.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-WeaponX2DualphaseEnergyLaserGun = Х-2 Двухфазовый энергетический лазерный пистолет
.desc = Этот передовой и дорогой лазерный пистолет главы службы безопасности космической станции был изготовлен на заказ. Он сочетает в себе мощь и функциональность. Пистолет имеет два режима стрельбы - лазерный, который наносит урон ожогами на расстоянии, и станер, предназначенный для обезвреживания и задержания противников. Это оружие символизирует власть и ответственность главы службы безопасности. Однако оно не перезаряжается автоматически
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-LaserBulletForHoS = лазера
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-stanerBullet = станера
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-LaserBulletForMEG = лазера
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-LaserBulletStan = станнера
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
- id: BookSecretDocumentsExodus #Exodus
- id: BookBusido # Corvax-Books
- id: BookSpaceLaw
- id: WeaponX2DualphaseEnergyLaserGun # кастомное оружие для гсб, сделано для exodus

- type: entity
id: LockerHeadOfSecurityFilled
Expand Down Expand Up @@ -321,6 +322,7 @@
- id: HoloprojectorSecurity
- id: BookSecretDocumentsExodus # Exodus-NukeSecretDocuments
- id: BookSpaceLaw
- id: WeaponX2DualphaseEnergyLaserGun # кастомное оружие для гсб, сделано для exodus

- type: entity
id: LockerFreezerVaultFilled
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: cargoProduct
id: SecurityMiniEnergyGun
icon:
sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
state: base
product: CrateSecurityMiniEnergyGun
cost: 2500
category: cargoproduct-category-name-security
group: market
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
id: CrateSecurityMiniEnergyGun
parent: CrateSecgear
name: A case of miniature energy pistols.
description: This box contains two miniature energy pistols. Security access is required to open it.
components:
- type: StorageFill
contents:
- id: WeaponMiniEnergyGun
amount: 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Сам прототип оружия
- type: entity
name: Mini energy gun
parent: BaseWeaponBatterySmall
id: WeaponMiniEnergyGun
description: A small energy gun with a built-in flashlight. It has two settings; disable and kill. Usually issued to security officers as a tactical weapon.
components:
- type: Sprite
sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 1.5
projectileSpeed: 75
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Exodus/Weapons/MiniEnergyGun/MiniEnergyGun.ogg
- type: Item
sprite: Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
size: Small
- type: ProjectileBatteryAmmoProvider
proto: LaserBulletForMEG
fireCost: 200
- type: BatteryWeaponFireModes
fireModes:
- proto: LaserBulletForMEG
fireCost: 200
- proto: LaserBulletStan
fireCost: 100
- type: Battery
maxCharge: 1200
startingCharge: 1200
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: StaticPrice
price: 250
- type: Sharp
- type: UnpoweredFlashlight
- type: PointLight
enabled: false
mask: /Textures/Effects/LightMasks/cone.png
autoRot: true
radius: 4
netsync: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# сам лазер
- type: entity
name: X-2 Dual phase energy laser gun
parent: BaseWeaponBatterySmall
id: WeaponX2DualphaseEnergyLaserGun
description: This advanced and expensive space station security chief's laser pistol was custom made. It combines power and functionality. The gun has two firing modes - laser, which causes burn damage at a distance, and staner, designed for disarming and detaining opponents. This weapon symbolizes the power and responsibility of the head of security. However, it is not automatically reloaded.
components:
- type: Sprite
sprite: Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-unshaded-4
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 2
projectileSpeed: 100
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Exodus/Weapons/HoSLaser/HoSLaser.ogg
- type: Item
sprite: Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
size: Small
- type: ProjectileBatteryAmmoProvider
proto: LaserBulletForHoS
fireCost: 200
- type: BatteryWeaponFireModes
fireModes:
- proto: LaserBulletForHoS
fireCost: 200
- proto: stanerBullet
fireCost: 175
- type: Battery
maxCharge: 2800
startingCharge: 2800
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: StaticPrice
price: 1000
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# проджект лазера
- type: entity
name: Laser
id: LaserBulletForHoS
parent: EmitterBolt
noSpawn: true
components:
- type: Sprite
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
layers:
- state: omnilaser_greyscale
shader: unshaded
color: red
- type: Projectile
impactEffect: BulletImpactEffectLaserForHoS
damage:
types:
Heat: 17

# проджект станера
- type: entity
name: Staner
id: stanerBullet
parent: BulletDisabler
noSpawn: true
components:
- type: Sprite
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
layers:
- state: omnilaser_greyscale
shader: unshaded
color: pink
- type: StaminaDamageOnCollide
damage: 30
- type: Projectile
impactEffect: BulletImpactEffectDisablerRed
damage:
types:
Heat: 5
soundHit:
collection: WeakHit
forceSound: true

# эффект от станера
- type: entity
id: BulletImpactEffectDisablerRed
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.2
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
state: impact_laser_greyscale
color: pink
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu

# эффект от лазера
- type: entity
id: BulletImpactEffectLaserForHoS
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.2
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
state: impact_laser_greyscale
color: red
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# продект лазера
- type: entity
name: Laser
id: LaserBulletForMEG
parent: EmitterBolt
noSpawn: true
components:
- type: Sprite
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
layers:
- state: omnilaser_greyscale
shader: unshaded
color: blue
- type: Projectile
impactEffect: BulletImpactEffectLaserForMEG
damage:
types:
Heat: 20

# эффект от лазера
- type: entity
id: BulletImpactEffectLaserForMEG
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.3
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
state: impact_laser_greyscale
color: blue
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu

# проджект станера(написан на основе проджекта лазера, ибо другие ломали фонарик)
- type: entity
name: Stunner
id: LaserBulletStan
parent: EmitterBolt
noSpawn: true
components:
- type: Sprite
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
layers:
- state: omnilaser_greyscale
shader: unshaded
color: cyan
- type: StaminaDamageOnCollide
damage: 25
- type: Projectile
impactEffect: BulletImpactEffectLaserStan
damage:
types:
Heat: 4.2

# эффект от станера
- type: entity
id: BulletImpactEffectLaserStan
noSpawn: true
components:
- type: TimedDespawn
lifetime: 0.3
- type: Sprite
drawdepth: Effects
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
state: impact_laser_greyscale
color: cyan
- type: EffectVisuals
- type: Tag
tags:
- HideContextMenu
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
id: HoSPDA
gloves: ClothingHandsGlovesCombat
ears: ClothingHeadsetAltSecurity
pocket1: WeaponX-2Dual-phaseEnergyLaserGun
pocket1: WeaponPistolMk58
storage:
back:
- Flash
- MagazinePistol
6 changes: 3 additions & 3 deletions Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
equipment:
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetSecurity
pocket1: WeaponMiniEnergyGun
pocket1: WeaponMiniEnergyGun # Убрал "WeaponPistolMk58" и добавил "WeaponMiniEnergyGun"
storage:
back:
- Flash
back: # Убрал "MagazinePistol "
- Flash
6 changes: 3 additions & 3 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
eyes: ClothingEyesGlassesSecurity
id: WardenPDA
ears: ClothingHeadsetSecurity
pocket1: WeaponMiniEnergyGun
pocket1: WeaponMiniEnergyGun # Убрал "WeaponPistolMk58" и добавил "WeaponMiniEnergyGun"
storage:
back:
- Flash
back: # Убрал "MagazinePistol"
- Flash
Loading

0 comments on commit ca151aa

Please sign in to comment.