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

Yashik #777

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Catalog/fills/Boxes/gift.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ ent-ADTPresentRandomInsaneSyndicate = подозрительный подаро
ent-ADTRandomNewYearGiftSpawner = спавнер случайного новогоднего подарка
.desc = { ent-MarkerBase.desc }
.suffix = { "Новый год" }

ent-ADTyashik = корзина для напитков
.desc = Здесь находится зарплата бармена...
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/job/department.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
department-Cyborgs = Синтетики
department-CentralCommand = Центральное Командование
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/roles/roles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-name-ADTAdmiralCentComm = Адмирал Центрального Командования
20 changes: 20 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Device/basket.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: entity
name: Ящичек
parent: BaseStorageItem
id: ADTyashik
description: Ящичек в котором лежит зарплата бармена...
components:
- type: Sprite
sprite: Structures/Machines/VendingMachines/condiments.rsi
state: icon
- type: Storage
maxItemSize: Normal
whitelist:
tags:
- DrinkBottle
grid:
- 0,0,3,2
- type: MultiHandedItem
- type: HeldSpeedModifier
walkModifier: 0.5
sprintModifier: 0.5
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@
SeniorOfficer: [ 1, 1 ]
ADTRoboticist: [ 1, 1 ] #ADT
ADTPathologist: [ 1 , 1 ] #ADT
ADTAdmiralCentComm: [1 , 1] #ADT
16 changes: 16 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/CentComm/admiralcentcomm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: job
id: ADTAdmiralCentComm
name: job-name-ADTAdmiralCentComm
description: job-description-ADTAdmiralCentComm
playTimeTracker: JobADTAdmiralCentCom
requirements:
- !type:DepartmentTimeRequirement
department: Medical
time: 21600 #6 hrs
startingGear: CentcomAdmiralGear
icon: "JobIconNanotrasen"
supervisors: job-supervisors-cmo
canBeAntag: false
access:
- Medical
- Maintenance
8 changes: 8 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@
- ADTSecurityCyborg
- Borg
primary: false

- type: department
id: CentralCommand
description: department-CentralCommand-description
color: "#3399CC"
roles:
- ADTAdmiralCentComm
primary: false
3 changes: 3 additions & 0 deletions Resources/Prototypes/ADT/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@

- type: playTimeTracker
id: JobRoboticist

- type: playTimeTracker
id: ADTAdmiralCentComm

#СССП Штуки

Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
- id: WeaponShotgunDoubleBarreledRubber
- id: DrinkShaker
- id: ClothingEyesHudBeer
- id: ADTyashik
amount: 1
- id: HandLabeler
amount: 1
- id: DrinkBottleBeer
Expand Down
Loading