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

[Да начнётся полыхание жоп #157

Closed
wants to merge 3 commits into from
Closed
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@
- CentCommOfficial
- NanoTrasenRepresentative #Sunrise-Edit
- Adjutant #Sunrise-edit
- ComMaid # Sunrise-Lust edit
# - ComMaid # Sunrise-Lust edit
primary: false
weight: 100

32 changes: 16 additions & 16 deletions Resources/Prototypes/_Lust/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
- type: entity
parent: BasePDA
id: CommaidPDA
name: Command maid PDA
components:
- type: Sprite
- type: Pda
id: CommaidIDCard
- type: Appearance
appearanceDataInit:
enum.PdaVisuals.PdaType:
!type:String
pda-commaid
- type: Icon
sprite: _Lust/Objects/Devices/pda.rsi
state: pda-commaid
#- type: entity
# parent: BasePDA
# id: CommaidPDA
# name: Command maid PDA
# components:
# - type: Sprite
# - type: Pda
# id: CommaidIDCard
# - type: Appearance
# appearanceDataInit:
# enum.PdaVisuals.PdaType:
# !type:String
# pda-commaid
# - type: Icon
# sprite: _Lust/Objects/Devices/pda.rsi
# state: pda-commaid
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- type: entity
parent: IDCardStandard
id: CommaidIDCard
name: Commaid ID card
components:
- type: Sprite
sprite: _Lust/Objects/Misc/id_cards.rsi
layers:
- state: silver
- state: idcommaid
- type: PresetIdCard
job: ComMaid
#- type: entity
# parent: IDCardStandard
# id: CommaidIDCard
# name: Commaid ID card
# components:
# - type: Sprite
# sprite: _Lust/Objects/Misc/id_cards.rsi
# layers:
# - state: silver
# - state: idcommaid
# - type: PresetIdCard
# job: ComMaid
90 changes: 45 additions & 45 deletions Resources/Prototypes/_Lust/Roles/Jobs/Command/commaid.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
- type: job
id: ComMaid
name: job-name-commaid
description: job-description-commaid
playTimeTracker: JobComMaid
requirements:
- !type:RoleTimeRequirement
role: JobJanitor
time: 36000
- !type:DepartmentTimeRequirement
department: Command
time: 12000
startingGear: ComMaidGear
icon: "JobIconComMaid"
supervisors: job-supervisors-captain
antagAdvantage: 20
displayWeight: 0
weight: 5
access:
- Command
- Service
- Janitor
- Hydroponics
- Kitchen
- Bar
- Theatre
- Maintenance
#- type: job
# id: ComMaid
# name: job-name-commaid
# description: job-description-commaid
# playTimeTracker: JobComMaid
# requirements:
# - !type:RoleTimeRequirement
# role: JobJanitor
# time: 36000
# - !type:DepartmentTimeRequirement
# department: Command
# time: 12000
# startingGear: ComMaidGear
# icon: "JobIconComMaid"
# supervisors: job-supervisors-captain
# antagAdvantage: 20
# displayWeight: 0
# weight: 5
# access:
# - Command
# - Service
# - Janitor
# - Hydroponics
# - Kitchen
# - Bar
# - Theatre
# - Maintenance

- type: startingGear
id: ComMaidGear
equipment:
jumpsuit: ClothingUniformJumpskirtElegantMaid
neck: BunnyButterfly
head: ClothingHeadNurseHat
eyes: ClothingEyesGlassesSunglasses
gloves: ClothingHandsGlovesLatex
shoes: BunnyShoesFilled
back: ClothingBackpackSatchelLeather
id: CommaidPDA
ears: ClothingHeadsetCommaid
#- type: startingGear
# id: ComMaidGear
# equipment:
# jumpsuit: ClothingUniformJumpskirtElegantMaid
# neck: BunnyButterfly
# head: ClothingHeadNurseHat
# eyes: ClothingEyesGlassesSunglasses
# gloves: ClothingHandsGlovesLatex
# shoes: BunnyShoesFilled
# back: ClothingBackpackSatchelLeather
# id: CommaidPDA
# ears: ClothingHeadsetCommaid

- type: jobIcon
parent: JobIcon
id: JobIconComMaid
icon:
sprite: /Textures/_Lust/Interface/Misc/job_icons.rsi
state: commaid
#- type: jobIcon
# parent: JobIcon
# id: JobIconComMaid
# icon:
# sprite: /Textures/_Lust/Interface/Misc/job_icons.rsi
# state: commaid
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/bagel.yml
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/box.yml
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/cog.yml
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/delta.yml
Original file line number Diff line number Diff line change
@@ -91,5 +91,5 @@
PeaceBorg: [ 2, 2 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/fland.yml
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/marathon.yml
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/meta.yml
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/oasis.yml
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/planet_delta.yml
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals:
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Maps/train.yml
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@
MedicalBorg: [ 4, 4 ]
SecurityBorg: [ 4, 4 ]
# Lust-start
ComMaid: [ 1, 1 ]
# ComMaid: [ 1, 1 ]
# Lust-end
- type: StationGoal
goals: