Skip to content
Closed
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
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_wega/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ job-description-surgeon = Ваша миссия — вскрывать, испр
job-description-coroner = Нет лучше собеседника, чем труп.
job-description-bso = Защитите командный состав, капитана и VIP-персон с ЦентКома ценой своей жизни.
job-description-postman = Доставляйте письма, получайте призент.
job-description-wardenHelper = Поддерживайте порядок и чистоту бриге, проверяйте камеры и арсенал, помогайте с допросами.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_wega/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ job-name-surgeon = хирург
job-name-coroner = коронер
job-name-bso = офицер "Синий Щит"
job-name-postman = почтальон
job-name-wardenHelper = помощник смотрителя

JobBarber = барбер
JobCBURNLeader = лидер РХБЗЗ
JobSurgeon = хирург
JobCoroner = коронер
JobBlueShieldOfficer = офицер "Синий Щит"
JobPostman = почтальон
JobWardenHelper = помощник смотрителя
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ ent-ClothingHeadHatPostmansoft = кепка почтальона
.desc = Классическая кепка с уплотненным козырьком, главный элемент форменного стиля.
ent-ClothingHeadHatPostmansoftFlipped = кепка почтальона
.desc = { ent-ClothingHeadHatPostmansoft.desc }
ent-ClothingHeadHatWardenHelper = кепка смотрителя
.desc = { ent-ClothingHeadHeadHatBaseFlippable.desc }
ent-ClothingHeadHatWardenHelperFlipped = кепка смотрителя
.desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ent-BlueShieldPDA = КПК офицера "Синий Щит"
.desc = Ничем не примечательный КПК.
ent-PostmanPDA = КПК почтальона
.desc = Небольшой и надежный спутник почтальона, хранящий все маршруты и адреса.
ent-WardenHelperPDA = КПК помощника смотрителя
.desc = { ent-BaseSecurityPDA.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ent-BlueShieldIDCard = ID карта офицера синий щит
.desc = { ent-IDCardStandard.desc }
ent-PostmanIDCard = ID карта почтальона
.desc = { ent-IDCardStandard.desc }
ent-WardenHelperIDCard = ID карта помощника смотрителя
.desc = { ent-IDCardStandard.desc }
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
- Pilot # Corvax-Pilot
- Detective
- Warden
- WardenHelper # Corvax-Wega-WardenHelper

- type: department
id: Science
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/_Wega/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,19 @@
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatPostmansoft]
id: ClothingHeadHatPostmansoftFlipped
name: postman cap

- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatWardenHelper
name: warden cap
description: The perfect cap for aspiring wardens.
components:
- type: Sprite
sprite: _Wega/Clothing/Head/Soft/wardsoft.rsi
- type: Clothing
sprite: _Wega/Clothing/Head/Soft/wardsoft.rsi

- type: entity
parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatWardenHelper]
id: ClothingHeadHatWardenHelperFlipped
name: warden cap
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Wega/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,15 @@
layers:
- state: green
- state: postman

- type: entity
id: SpawnPointWardenHelper
parent: SpawnPointJobBase
name: warden assistant
components:
- type: SpawnPoint
job_id: WardenHelper
- type: Sprite
layers:
- state: green
- state: wardenhelper
21 changes: 20 additions & 1 deletion Resources/Prototypes/_Wega/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,23 @@
borderColor: "#e39751"
accentVColor: "#3c4d9b"
- type: Icon
state: pda-postman
state: pda-postman

- type: entity
parent: BaseSecurityPDA
id: WardenHelperPDA
name: warden assistant PDA
description: The OS appears to have been jailbroken.
components:
- type: Pda
id: WardenHelperIDCard
- type: Appearance
appearanceDataInit:
enum.PdaVisuals.PdaType:
!type:String
pda-warden
- type: PdaBorderColor
borderColor: "#A32D26"
accentVColor: "#949137"
- type: Icon
state: pda-warden
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,16 @@
- state: default
- state: idpostman
- type: PresetIdCard
job: Postman
job: Postman

- type: entity
parent: IDCardStandard
id: WardenHelperIDCard
name: warden assistant ID card
components:
- type: Sprite
layers:
- state: default
- state: idwardenhelper
- type: PresetIdCard
job: WardenHelper
17 changes: 17 additions & 0 deletions Resources/Prototypes/_Wega/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,20 @@
- Top
- Bottom
- Socks

- type: roleLoadout
id: JobWardenHelper
groups:
- Inventory # Corvax-Loadouts
- WardenJumpsuit
- SecurityBackpack
- SecurityBelt
- WardenOuterClothing
- SecurityShoes
- SurvivalSecurity
- Trinkets
- SecurityStar
- GroupSpeciesBreathToolSecurity
- Top
- Bottom
- Socks
58 changes: 58 additions & 0 deletions Resources/Prototypes/_Wega/Roles/Jobs/Security/wardenHelper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
- type: job
id: WardenHelper
name: job-name-wardenHelper
description: job-description-wardenHelper
playTimeTracker: JobWardenHelper
requirements:
- !type:DepartmentTimeRequirement
department: Security
time: 72000 #20 hrs
- !type:TraitsRequirement #Corvax-TraitsRequirement
inverted: true
traits:
- Muted
weight: 5
startingGear: WardenHelperGear
icon: "JobIconWardenHelper"
supervisors: job-supervisors-hos
canBeAntag: false
access:
- Security
- Brig
- Armory
- Maintenance
- Service
- External
- Detective
- Cryogenics
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]

- type: startingGear
id: WardenHelperGear
equipment:
head: ClothingHeadHatWardenHelper
eyes: ClothingEyesGlassesSecurity
id: WardenHelperPDA
ears: ClothingHeadsetSecurity
pocket1: WeaponPistolMk58
pocket2: BookSpaceLaw
storage:
back:
- Flash
- MagazinePistol

- type: chameleonOutfit
id: WardenHelperChameleonOutfit
job: WardenHelper
hasMindShield: true
equipment:
head: ClothingHeadHatWardenHelper
mask: ClothingMaskGasSecurity
outerClothing: ClothingOuterCoatWarden
jumpsuit: ClothingUniformJumpsuitWarden
neck: Dinkystar
belt: ClothingBeltSecurity
gloves: ClothingHandsGlovesCombat
shoes: ClothingShoesBootsJack
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Wega/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@

- type: playTimeTracker
id: JobPostman

- type: playTimeTracker
id: JobWardenHelper
8 changes: 8 additions & 0 deletions Resources/Prototypes/_Wega/StatusIcon/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,11 @@
sprite: /Textures/_Wega/Interface/Misc/job_icons.rsi
state: Postman
jobName: job-name-postman

- type: jobIcon
parent: JobIcon
id: JobIconWardenHelper
icon:
sprite: /Textures/_Wega/Interface/Misc/job_icons.rsi
state: WardenHelper
jobName: job-name-wardenhelper
5 changes: 4 additions & 1 deletion Resources/Textures/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github), wardenhelper by RedTerrorDark (Github)",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -205,6 +205,9 @@
{
"name": "warden"
},
{
"name": "wardenhelper"
},
{
"name": "zookeeper"
}
Expand Down
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.
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24, syndiop/agent/commander made by Archee1 (Github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24, syndiop/agent/commander made by Archee1 (Github), idwardenhelper by RedTerrorDark (Github)",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -265,6 +265,9 @@
{
"name": "idpostman"
},
{
"name": "idwardenhelper"
},
{
"name": "gold-inhand-left",
"directions": 4
Expand Down
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.
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,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprite by RedTerrorDark (Github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon_flipped"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "flipped-equipped-HELMET",
"directions": 4
},
{
"name": "flipped-inhand-left",
"directions": 4
},
{
"name": "flipped-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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by zekins3366",
"copyright": "Created by zekins3366, WardenHelper by RedTerrorDark (Github)",
"size": {
"x": 8,
"y": 8
Expand All @@ -21,6 +21,9 @@
},
{
"name": "Postman"
},
{
"name": "WardenHelper"
}
]
}
Loading