* jumpsuit sprite

* hat and meta to match

* pda

* id card

* update spawner jobs.yml

* update identification_cards.yml

* Update pda.yml

* update jumpsuits.yml

* zookeeper job yml

* zookeeper icon

* update hats.yml

* woops fixed hats.yml

* fix id cards yml

* job spawner icon and json

* update map yml

* update departments yml

* job icon meta.json

* comes with the hat

* real

* real

* localization

* fix spawner jobs yml

* playtime tracker

* kettle spawn

* Revert "kettle spawn"

This reverts commit 37c241cb31a6f186f31a73f168a93649423e839a.

* kettle spawn

* service locked windoor

* updated sprites and updated meta.json thanks to EmoGarbage

* meta.json

* Update Resources/Textures/Objects/Devices/pda.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* credit to EmoGarbage404 and alphabetized

* license

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
Cheackraze
2022-10-23 15:42:25 -04:00
committed by GitHub
parent 5be514821e
commit a512a77046
28 changed files with 461 additions and 270 deletions

View File

@@ -39,6 +39,7 @@ job-name-ertsecurity = ERT security
job-name-ertmedic = ERT medic
job-name-ertjanitor = ERT janitor
job-name-boxer = boxer
job-name-zookeeper = zookeeper
# Role timers - Make these alphabetical or I cut you
JobAtmosphericTechnician = atmospheric technician
@@ -82,3 +83,4 @@ JobStationEngineer = station engineer
JobTechnicalAssistant = technical assistant
JobWarden = warden
JobBoxer = boxer
JobZookeeper = zookeeper

File diff suppressed because it is too large Load Diff

View File

@@ -478,3 +478,14 @@
sprite: Clothing/Head/Hats/rasta.rsi
- type: Clothing
sprite: Clothing/Head/Hats/rasta.rsi
- type: entity
parent: ClothingHeadBase
id: ClothingHeadSafari
name: safari hat
description: Keeps the sun out of your eyes. Makes you a target for the locals.
components:
- type: Sprite
sprite: Clothing/Head/Hats/safarihat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/safarihat.rsi

View File

@@ -812,6 +812,17 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/reporter.rsi
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSafari
name: safari suit
description: Perfect for a jungle excursion.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/safari.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/safari.rsi
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitJournalist

View File

@@ -505,3 +505,15 @@
layers:
- state: green
- state: psychologist
- type: entity
id: SpawnPointZookeeper
parent: SpawnPointJobBase
name: zookeeper
components:
- type: SpawnPoint
job_id: Zookeeper
- type: Sprite
layers:
- state: green
- state: zookeeper

View File

@@ -688,6 +688,21 @@
- type: Icon
state: pda-reporter
- type: entity
parent: BasePDA
id: ZookeeperPDA
name: zookeeper PDA
description: Made with genuine synthetic leather. Crikey!
components:
- type: PDA
id: ZookeeperIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
state: pda-zookeeper
- type: Icon
state: pda-zookeeper
- type: entity
parent: BasePDA
id: BoxerPDA

View File

@@ -525,6 +525,18 @@
- type: PresetIdCard
job: Boxer
- type: entity
parent: IDCardStandard
id: ZookeeperIDCard
name: zookeeper ID card
components:
- type: Sprite
layers:
- state: default
- state: idzookeeper
- type: PresetIdCard
job: Zookeeper
- type: entity
parent: IDCardStandard
id: DetectiveIDCard

View File

@@ -12,6 +12,7 @@
# TODO remove these with parameterized prototypes/whatever we end up doing
# Windoors (alphabetical)
- type: entity
parent: Windoor
id: WindoorBarLocked
@@ -76,6 +77,14 @@
- type: AccessReader
access: [["Kitchen"], ["Hydroponics"]]
- type: entity
parent: Windoor
id: WindoorServiceLocked
suffix: Service, Locked
components:
- type: AccessReader
access: [["Service"]]
- type: entity
parent: Windoor
id: WindoorTheatreLocked

View File

@@ -44,3 +44,4 @@
ServiceWorker: [ 2, 2 ]
SecurityCadet: [ 3, 4 ]
Detective: [ 1, 1 ]
Zookeeper: [1, 1]

View File

@@ -0,0 +1,23 @@
- type: job
id: Zookeeper
name: job-name-zookeeper
playTimeTracker: JobZookeeper
startingGear: ZookeeperGear
icon: "Zookeeper"
supervisors: job-supervisors-hop
access:
- Service
- Maintenance
- type: startingGear
id: ZookeeperGear
equipment:
jumpsuit: ClothingUniformJumpsuitSafari
back: ClothingBackpackFilled
head: ClothingHeadSafari
shoes: ClothingShoesColorWhite
id: ZookeeperPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpsuitSafari
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

View File

@@ -22,6 +22,7 @@
- Musician
- Passenger
- Reporter
- Zookeeper
- SecurityCadet
- ServiceWorker
- TechnicalAssistant

View File

@@ -126,3 +126,6 @@
- type: playTimeTracker
id: JobBoxer
- type: playTimeTracker
id: JobZookeeper

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

View File

@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 961 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 551 B

View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -132,6 +132,9 @@
},
{
"name": "SecurityCadet"
},
{
"name": "Zookeeper"
}
]
}

View File

@@ -115,6 +115,9 @@
{
"name": "mime"
},
{
"name": "zookeeper"
},
{
"name": "reporter"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@@ -163,6 +163,9 @@
{
"name": "pda-interntech"
},
{
"name": "pda-zookeeper"
},
{
"name": "pda-ert"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -148,6 +148,9 @@
{
"name": "idmusician"
},
{
"name": "idzookeeper"
},
{
"name": "idintern-cadet"
},