Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

страйкбольные пульки и привод #475

Merged
merged 4 commits into from
Mar 9, 2024
Merged
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
Binary file added Resources/Audio/Weapons/Guns/Gunshots/airsoft.ogg
Binary file not shown.
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1434,3 +1434,11 @@ Entries:
- {message: "Нианы теперь могут есть хлеб, тофу, сыр, гипоаллергенный шоколад, круассаны и вафли", type: Tweak}
id: 55704 #костыль отображения в Обновлениях
time: '2024-03-09T08:20:00.0000000+00:00'

- author: Пётр Игнатьевич
changes:
- {message: "Добавлены шарики для страйкбола и страйкбольный автомат. Пока только щитспавном", type: Add}
- {message: "Исправлено то, что секрет запускался только при 20 игроках. Режим ядерных и зомби получил чуть больше шанса в секрете", type: Tweak}
- {message: "Добавлены кассеты с музыкой", type: Add}
id: 55705 #костыль отображения в Обновлениях
time: '2024-03-09T08:20:00.0000000+00:00'
16 changes: 16 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -224,3 +224,19 @@ ent-ADTWeaponLauncherSchmel = РПО "Шмель-3М"
ent-ADTWeaponLauncherSapog = РПГ-32 "Сапог"
.desc = Базовое противотанковое оружие пехоты СССП - ручной гранатомет, способный запускать кумулятивные и термобарические гранаты.
.suffix = { "СССП, Гранатомёт" }

ent-ADTCartridgeStrikeballBibis = страйкбольный шарик
.desc = Маленький пластиковый шарик, используемый для страйкбола.
.suffix = { "Страйкбол" }

ent-ADTBulletBibis = страйкбольный шарик
.desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы.
.suffix = { "Страйкбол" }

ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер"
.desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол.
.suffix = { "Страйкбол" }

ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата
.desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков.
.suffix = { "Страйкбол" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
- type: Tag
id: ADTCartridgeBibis

- type: Tag
id: ADTMagazineRifleBibis

- type: entity
id: ADTBaseCartridgeStrikeball
name: bibis
parent: BaseCartridge
abstract: true
components:
- type: Tag
tags:
- Cartridge
- ADTCartridgeBibis
- type: CartridgeAmmo
deleteOnSpawn: true
- type: Sprite
noRot: false
sprite: ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi
layers:
- state: base
map: ["enum.AmmoVisualLayers.Base"]
- type: Appearance
- type: SpentAmmoVisuals
- type: StaticPrice
price: 1

- type: entity
id: ADTCartridgeStrikeballBibis
name: bibis
parent: ADTBaseCartridgeStrikeball
components:
- type: CartridgeAmmo
proto: ADTBulletBibis

- type: entity
id: ADTBulletBibis
name: bibis ball
parent: BaseBulletRubber
noSpawn: true
components:
- type: Projectile
damage:
types:
Blunt: 0.1
- type: StaminaDamageOnCollide
damage: 5
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
layers:
- state: depleted-uranium

- type: entity
name: Lecter Strikeball
parent: BaseWeaponRifle
id: ADTWeaponRifleLecterBibis
description: A high end military grade assault rifle. Uses .20 rifle ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
- type: Gun
fireRate: 10
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/airsoft.ogg
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: ADTMagazineRifleBibis
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- ADTMagazineRifleBibis
gun_chamber:
name: Chamber
startingItem: ADTCartridgeStrikeballBibis
priority: 1
whitelist:
tags:
- ADTCartridgeBibis
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance


# Empty mags
- type: entity
id: ADTBaseMagazineBibis
name: "magazine bibis"
parent: BaseItem
abstract: true
components:
- type: Tag
tags:
- ADTMagazineRifleBibis
- type: Item
size: Small
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- ADTCartridgeBibis
capacity: 200
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag
steps: 2
zeroVisible: false
- type: Appearance

# Magazines
- type: entity
id: ADTMagazineRifleBibis
name: "magazine bibis"
parent: ADTBaseMagazineBibis
components:
- type: BallisticAmmoProvider
proto: ADTCartridgeStrikeballBibis
- type: Sprite
layers:
- state: red
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy",
"states": [
{
"name": "base"
},
{
"name": "base-spent"
}
]
}
Loading