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

clown security [WIP] #1909

Closed
wants to merge 2 commits into from
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
loadout-group-security-clown-mask = Клоун СБ, маска
loadout-group-security-clown-jumpsuit = Клоун СБ, комбинезон
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
- SecurityOfficer
- Warden
- SecurityPilot
- SecurityClown #ss220

- type: department
id: Science
Expand Down
29 changes: 28 additions & 1 deletion Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- type: Icon
sprite: Objects/Devices/pda.rsi
state: pda-ce_dark

- type: entity
parent: BasePDA
id: SeniorServicePDA
Expand Down Expand Up @@ -84,3 +84,30 @@
- type: Icon
sprite: Objects/Devices/pda.rsi
state: pda-magistrate

- type: entity
parent: BasePDA
id: SecurityClownPDA
name: КПК клоуна СБ
description: Красный, потому что СБ. Белый, потому что клоун.
components:
- type: Pda
id: SecurityClownIDCard
state: pda-security-clown
- type: PdaBorderColor
borderColor: "#731611" #SS220 PDA-Resprite
- type: Sprite #SS220 PDA-Resprite-Start
sprite: Objects/Devices/pda.rsi
layers:
- map: [ "enum.PdaVisualLayers.Base" ]
- state: "screen-clown"
shader: "unshaded"
- state: "light_overlay"
map: [ "enum.PdaVisualLayers.Flashlight" ]
shader: "unshaded"
visible: false
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
visible: false #SS220 PDA-Resprite-End
- type: Icon
state: pda-security
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@
job: SecurityOfficer
name: Рокси

- type: entity
parent: IDCardStandard
id: SecurityClownIDCard
name: ID карта (клоун СБ)
components:
- type: Sprite
layers:
- state: default
- state: idsecurityclown
- type: PresetIdCard
job: SecurityClown


- type: entity
parent: PassengerIDCard
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/SS220/Entities/markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@
layers:
- state: green
- state: lawyer

- type: entity
id: SpawnPointClownSecurity
parent: SpawnPointJobBase
name: Клоун СБ
components:
- type: SpawnPoint
job_id: SecurityClown
- type: Sprite
layers:
- state: green
- state: security_officer
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: loadout
id: ClownSecurityMask
equipment:
mask: ClothingMaskClownSecurity
21 changes: 21 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,27 @@
- SecurityHat
- PilotCapCap
# Пилот (Конец)

# Клоун СБ (Начало)

- type: loadoutGroup
id: SecurityClownMask
name: loadout-group-security-clown-mask
loadouts:
- ClownSecurityMask
- ClownPennywiseMask

- type: loadoutGroup
id: SecurityClownJumpsuit
name: loadout-group-security-clown-jumpsuit
loadouts:
- SecurityGrayJumpsuit
- SecurityGrayJumpskirt
- ClownJumpsuit
- ClownJumpskirt

# Клоун СБ (Конец)

#! Служба безопасности (Конец)

#! Медицинский отдел (Начало)
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@
- SecurityBelt
- Trinkets

# Клоун СБ

- type: roleLoadout
id: JobSecurityClown
groups:
- SecurityClownMask
- SecurityNeck #holster loadout
- SecurityClownJumpsuit
- SecurityBackpack
- ClownShoes
- Trinkets

# Пилот
- type: roleLoadout
id: JobSecurityPilot
Expand Down
46 changes: 46 additions & 0 deletions Resources/Prototypes/SS220/Roles/Jobs/Security/security_clown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: job
id: SecurityClown
name: клоун СБ
description: Устройте смешной арест. Покажите экипажу настояющую шутку правосудия!
playTimeTracker: JobSecurityClown
requirements:
- !type:DepartmentTimeRequirement
department: Security
time: 300000 # SS220-RoleTime 2
- !type:SpeciesRequirement #SS220-jobbans begin
inverted: true
species:
- Felinid #SS220-jobbans end
startingGear: SecurityClownGear
icon: "JobIconSecurityClown"
supervisors: job-supervisors-security
canBeAntag: false
access:
- Security
- Brig
- Maintenance
- Service
- External
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]

- type: startingGear
id: SecurityClownGear
equipment:
head: ClothingHeadHelmetBasic
id: SecurityClownPDA
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetSecurity
outerClothing: ClothingOuterArmorBasic
belt: ClothingBeltSecurityFilled
gloves: ClothingHandsGlovesCombat #SS220 PilotsGloves
pocket1: WeaponPistolMk58Nonlethal
storage:
back:
- BoxSurvivalSecurity
- Flash
- MagazinePistolRubber
- MagazinePistolRubber
- FlashlightSeclite
- DrinkRelaxingPeachCan
3 changes: 3 additions & 0 deletions Resources/Prototypes/SS220/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
- type: playTimeTracker
id: JobSeniorOfficer

- type: playTimeTracker
id: JobSecurityClown

- type: playTimeTracker
id: JobSeniorPhysician

Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/SS220/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
icon:
sprite: /Textures/SS220/Interface/Misc/job_icons.rsi
state: SecurityPilot

- type: jobIcon
parent: JobIcon
id: JobIconSecurityClown
icon:
sprite: /Textures/SS220/Interface/Misc/job_icons.rsi
state: SecurityClown
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Devices/pda.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@
},
{
"name": "pda-seniorofficer"
},
{
"name": "pda-security-clown"
},
{
"name": "pda-seniorservice"
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.
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@
{
"name": "idsecurityofficer"
},
{
"name": "idsecurityclown"
},
{
"name": "idshaftminer"
},
Expand Down
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
Expand Up @@ -19,6 +19,9 @@
},
{
"name": "slave"
},
{
"name": "SecurityClown"
}
]
}
Loading