diff --git a/Resources/Locale/ru-RU/ADT/Catalog/fills/Boxes/gift.ftl b/Resources/Locale/ru-RU/ADT/Catalog/fills/Boxes/gift.ftl index d3e11b6bde2..33a9c6527b2 100644 --- a/Resources/Locale/ru-RU/ADT/Catalog/fills/Boxes/gift.ftl +++ b/Resources/Locale/ru-RU/ADT/Catalog/fills/Boxes/gift.ftl @@ -25,3 +25,6 @@ ent-ADTPresentRandomInsaneSyndicate = подозрительный подаро ent-ADTRandomNewYearGiftSpawner = спавнер случайного новогоднего подарка .desc = { ent-MarkerBase.desc } .suffix = { "Новый год" } + +ent-ADTyashik = корзина для напитков + .desc = Здесь находится зарплата бармена... \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/job/department.ftl b/Resources/Locale/ru-RU/ADT/job/department.ftl index 2758f1545b1..de1694816ee 100644 --- a/Resources/Locale/ru-RU/ADT/job/department.ftl +++ b/Resources/Locale/ru-RU/ADT/job/department.ftl @@ -1 +1,2 @@ department-Cyborgs = Синтетики +department-CentralCommand = Центральное Командование \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/roles/roles.ftl b/Resources/Locale/ru-RU/ADT/roles/roles.ftl new file mode 100644 index 00000000000..d835f3b7cc8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/roles/roles.ftl @@ -0,0 +1 @@ +job-name-ADTAdmiralCentComm = Адмирал Центрального Командования \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/basket.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/basket.yml new file mode 100644 index 00000000000..6087d5f45eb --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/basket.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml index 1e01ad016f7..2898459c8b1 100644 --- a/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml +++ b/Resources/Prototypes/ADT/Maps/ADTMaps/atlas.yml @@ -75,3 +75,4 @@ SeniorOfficer: [ 1, 1 ] ADTRoboticist: [ 1, 1 ] #ADT ADTPathologist: [ 1 , 1 ] #ADT + ADTAdmiralCentComm: [1 , 1] #ADT \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/CentComm/admiralcentcomm.yml b/Resources/Prototypes/ADT/Roles/Jobs/CentComm/admiralcentcomm.yml new file mode 100644 index 00000000000..7ce69f166f0 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/CentComm/admiralcentcomm.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/departments.yml b/Resources/Prototypes/ADT/Roles/Jobs/departments.yml index 3974216474b..956facfc33f 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/departments.yml @@ -11,3 +11,11 @@ - ADTSecurityCyborg - Borg primary: false + +- type: department + id: CentralCommand + description: department-CentralCommand-description + color: "#3399CC" + roles: + - ADTAdmiralCentComm + primary: false \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml index b0e525142f0..0c458c2e75f 100644 --- a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -30,6 +30,9 @@ - type: playTimeTracker id: JobRoboticist + +- type: playTimeTracker + id: ADTAdmiralCentComm #СССП Штуки diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 974ef189d23..c0ec8314526 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -9,6 +9,8 @@ - id: WeaponShotgunDoubleBarreledRubber - id: DrinkShaker - id: ClothingEyesHudBeer + - id: ADTyashik + amount: 1 - id: HandLabeler amount: 1 - id: DrinkBottleBeer