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

Cosmetic #38

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
components:
- type: StorageFill
contents:
- id: ClothingHeadHatCapHoS # Stories
- id: ClothingHeadHatBeretHoS
- id: ClothingHeadHatHoshat
- id: ClothingUniformJumpskirtHoSAlt
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1790,6 +1790,11 @@
name: uplink-balloon-name
description: uplink-balloon-desc
productEntity: BalloonSyn
# Stories-start
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 0
# Stories-end
cost:
Telecrystal: 20
categories:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,7 @@
- ClothingUniformJumpsuitHoP
- ClothingUniformJumpskirtHoP
- ClothingHeadHatBeretHoS
- ClothingHeadHatCapHoS # Stories
- ClothingHeadHatHoshat
- ClothingUniformJumpsuitHoS
- ClothingUniformJumpskirtHoS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
equipment:
head: ClothingHeadHatBeretHoS

- type: loadout # Stories
id: HeadofSecurityCap
equipment:
head: ClothingHeadHatCapHoS

# Neck
- type: loadout
id: HeadofSecurityCloak
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
- StoriesWristwatchGold
- ClothingNeckCloakCollector
- ClothingNeckCloakAnomalist
- NeckLizard
- ClothingNeckCloakSnake
- ToyFigurineColossus
- ToyFigurineAshDragon
Expand Down Expand Up @@ -1254,6 +1255,7 @@
loadouts:
- HeadofSecurityHead
- HeadofSecurityBeret
- HeadofSecurityCap # Stories

- type: loadoutGroup
id: HeadofSecurityJumpsuit
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelCrateTacticalMaid
name: чёрно-красный вещмешок
description: Вместительный и удобный вещмешок цвета эбонита и крови, в который влезут «игрушки» для любых возрастов.
components:
- type: Storage
grid:
- 0,0,8,4
- type: StorageFill
contents:
- id: ClothingUniformJumpskirtTacticalMaid
- id: ClothingHeadHatTacticalMaidHeadband
- id: ClothingUniformJumpskirtTacticool
- id: ClothingHandsTacticalMaidGloves
- id: ClothingShoesColorBlack
20 changes: 20 additions & 0 deletions Resources/Prototypes/_Stories/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
- type: listing
id: UplinkClothingTacticalMaid
name: Набор горничной синдиката
description: Предполагается, что у лучших горничных должны быть дизайнерские костюмы.
productEntity: ClothingBackpackDuffelCrateTacticalMaid
cost:
Telecrystal: 6
categories:
- UplinkPointless

- type: listing
id: UplinkRadioJammerIndustrial
name: Экспериментальный глушитель связи
Expand Down Expand Up @@ -79,3 +89,13 @@
whitelist:
tags:
- NukeOpsUplink

- type: listing
id: UplinkDogEars
name: Собачьи ушки
description: Тяф!
productEntity: ClothingHeadHatDogEars
cost:
Telecrystal: 26
categories:
- UplinkPointless
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Stories/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,14 @@
- ClothMade
- HamsterWearable
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCapHoS
name: фуражка главы службы безопасности
description: Прочная форменная фуражка начальника службы безопасности. Напоминает рядовым офицерам, кто здесь главный.
components:
- type: Sprite
sprite: _Stories/Clothing/Head/Hats/hoshat.rsi
- type: Clothing
sprite: _Stories/Clothing/Head/Hats/hoshat.rsi
17 changes: 17 additions & 0 deletions Resources/Prototypes/_Stories/Loadouts/cargo_technician.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: loadoutEffectGroup
id: CargoTechnicianNeckLizard
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobCargoTechnician
time: 36000 #10 hrs

- type: loadout
id: NeckLizard
effects:
- !type:GroupLoadoutEffect
proto: CargoTechnicianNeckLizard
storage:
back:
- ClothingNeckCloakAdmin
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Stories/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Hats
- type: latheRecipe
parent: BaseCommandHatRecipe
id: ClothingHeadHatCapHoS
result: ClothingHeadHatCapHoS
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/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading