forked from AdventureTimeSS14/space_station_ADT
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ПЕРЕНОС] Добавлен страйкбольный лектер (AdventureTimeSS14#350)
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> Этот ПР переносить страйкбольный лектер **Медиа** <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> - add: Добавлен страйкбольный лектер ![image](https://github.com/user-attachments/assets/d9afe2ae-5e4d-49e0-8c02-f2528b43d6f1)
- Loading branch information
Showing
17 changed files
with
197 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ent-ADTWeaponRifleLecterBibis = страйкбольный "Лектер" | ||
.desc = Релика штурмовой винтовки "Лектер", сделанная для игры в страйкбол. | ||
.suffix = { "Страйкбол" } |
3 changes: 3 additions & 0 deletions
3
...e/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ent-ADTCartridgeStrikeballBibis = страйкбольный шарик | ||
.desc = Маленький пластиковый шарик, используемый для страйкбола. | ||
.suffix = { "Страйкбол" } |
3 changes: 3 additions & 0 deletions
3
...ale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magazines.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ent-ADTMagazineRifleBibis = магазин от страйкбольного автомата | ||
.desc = Магазин для страйкбольного автомата, с двумя сотнями маленьких шариков. | ||
.suffix = { "Страйкбол" } |
3 changes: 3 additions & 0 deletions
3
...ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
ent-ADTBulletBibis = страйкбольный шарик | ||
.desc = Если ты увидел этот шарик в полете - ты пекуш бубиш шимбамбулеш. И выйди уже из матрицы. | ||
.suffix = { "Страйкбол" } |
30 changes: 30 additions & 0 deletions
30
Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikball.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
- 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/Casings/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 |
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/fill.txt
This file was deleted.
Oops, something went wrong.
48 changes: 48 additions & 0 deletions
48
Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# 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"] |
16 changes: 16 additions & 0 deletions
16
...urces/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/BulletBibis.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
- type: entity | ||
id: ADTBulletBibis | ||
name: bibis ball | ||
parent: ADTBaseBulletRubber | ||
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 |
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/fill.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fill.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,3 +33,9 @@ | |
|
||
- type: Tag | ||
id: ADTSteelSheet | ||
|
||
- type: Tag | ||
id: ADTCartridgeBibis | ||
|
||
- type: Tag | ||
id: ADTMagazineRifleBibis |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+194 Bytes
...es/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/base-spent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+194 Bytes
...Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions
17
Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/airsoft_bibis.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} | ||
] | ||
} |