Skip to content

Commit

Permalink
Вещи ЦК и суперсинтезатор в лодауте музыканта.
Browse files Browse the repository at this point in the history
  • Loading branch information
RipZoro1 committed Oct 30, 2024
1 parent 3357315 commit 40ca72d
Show file tree
Hide file tree
Showing 16 changed files with 107 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
ent-ADTClothingBackpackSatchelBlueshield = сумка офицера синего щита
.desc = Крайне вместительная черно-синяя сумка с яркими белыми эмблемами щита, предназначенная для хранения охранного и медицинского арсенала Офицеров Синего Щита.
ent-ADTClothingCentComBackpack = сумка центком
.desc Зелёная сумка. Пахнет свежестью.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ent-ADTClothingOuterCoatLabPathologist = халат патологоанатом
.desc = { ent-ClothingOuterCoatLab.desc }
ent-ADTClothingOuterApronPathologist = фартук патологоанатома
.desc = Фартук для работы с трупами.
ent-ADTClothingKadet = шинель для Кадетов СБ
ent-ADTClothingKadet = шинель для кадетов сб
.desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА
ent-ADTClothingOuterGraySweatshirtTop = серая толстовка-топка
Expand All @@ -24,3 +24,6 @@ ent-ADTClothingOuterCoatInvestigator = бушлат следователя Сл
ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина
.desc = Плотная, поношенная куртка-бомбер атмосианина.
ent-ADTClothingOuterCoatCentCom = пальто центком
.desc = Зеленое пальто с золотыми вставками. На спине выгравирована золотая буква N. Такое пальто носят только важные персоны...
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@
components:
- type: Sprite
sprite: ADT/Clothing/Back/pathologist_satchel.rsi

# Сумка ЦентКом
- type: entity
parent: ClothingBackpackSatchel
id: ADTClothingCentComSatchel
name: centcom satchel
description: Green satchel. He smells fresh
components:
- type: Sprite
sprite: ADT/Clothing/Back/centcom_satchel.rsi
27 changes: 27 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,30 @@
sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi

#Пальто ЦентКом
- type: entity
parent: ClothingOuterBase
id: ADTClothingOuterCoatCentCom
name: centcom coat
description: A green coat with gold inserts. The golden letter N is emblazoned on the back. Only the big shots wear this coat...
components:
- type: Storage
grid:
- 0,0,3,1
maxItemSize: Normal
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi
- type: StorageFill
contents:
- id: RubberStampCentcom
- id: PenCentcom
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.6
Heat: 0.7
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@
ClothingOuterCoatExpensive: 1
ClothingNeckScarfStripedCentcom: 3
ClothingNeckCloakCentcom: 3
ADTClothingOuterCoatCentCom: 3 #ADT-Tweak
ADTClothingCentComSatchel: 3 #ADT-Tweak
9 changes: 9 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@
id: MusicianWintercoat
equipment:
outerClothing: ClothingOuterWinterMusician

- type: loadoutEffectGroup
id: SuperSynthesizerInstrument
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: Musician
time: 72000 #20 hrs
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.
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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.
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 40ca72d

Please sign in to comment.