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

Collar Me Surprised #105

Merged
merged 6 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
Expand Up @@ -15,3 +15,4 @@
ClothingOuterWinterMiner: 2
ClothingNeckScarfStripedBrown: 3
ClothingShoesBootsWinterCargo: 2
ClothingNeckCollarLogi: 1 # Floofstation - Collar addition
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
ClothingNeckScarfStripedCentcom: 3
ClothingShoesBootsWinterCentCom: 2 #Delta V: Add departmental winter boots
ClothingNeckCloakCentcom: 3
ClothingNeckCollarCC: 3 # Floofstation - Collar addition
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
ClothingHandsGlovesColorBlack: 4
ClothingEyesGlassesCheapSunglasses: 2
ClothingUniformLoinCloth: 5 # FloofStation
ClothingNeckCollarBlue: 1 # Floofstation - Collar addition
ClothingNeckCollarBlack: 1 # Floofstation - Collar addition
ClothingLongcoatNT: 2 # Floofstation
ClothingLongcoatAL: 2 # Floofstation
ClothingLongcoatBrown: 2 # Floofstation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
ClothingOuterWinterEngi: 2
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
ClothingNeckCollarEngi: 1 # Floofstation - Collar addition
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
ClothingHeadHatSurgcapBlue: 4
ClothingHeadHatSurgcapPurple: 4
ClothingShoesBootsWinterMed: 2
ClothingNeckCollarMed: 1 # Floofstation - Collar addition
contrabandInventory: #DeltaV
UniformScrubsColorCybersun: 1 #DeltaV
ClothingHeadHatSurgcapCybersun: 1 #DeltaV
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
ClothingMaskGas: 3
ClothingOuterWinterSci: 2
ClothingNeckScarfStripedPurple: 3
ClothingNeckCollarEpi: 1 # Floofstation - Collar addition
ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
ClothingShoesBootsWinterSci: 2
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
## ClothingOuterArmorBasicSlim: 2
ClothingNeckScarfStripedRed: 3
ClothingEyesBlindfold: 1
ClothingNeckCollarSec: 1 # Floofstation - Collar addition
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingShoesBootsCowboyBlack: 1
ClothingHeadHatCowboyBlack: 1
ClothingHeadHatCowboyBlack: 1
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
ClothingNeckScarfStripedSyndieGreen: 2
ClothingNeckScarfStripedSyndieRed: 2
ClothingShoesBootsWinterSyndicate: 2
ClothingNeckCollarSyndi: 1 # Floofstation - Collar addition

emaggedInventory:
ClothingOuterCoatSyndieCapArmored: 1
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,8 @@
- CarpetPurple
- CarpetCyan
- CarpetWhite
# Floofstation - Collars
- ClothingNeckCollarCmd
- type: EmagLatheRecipes
emagStaticRecipes:
- ClothingHeadHatCentcomcap
Expand Down
109 changes: 109 additions & 0 deletions Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarBlue
name: blue collar
description: A cute blue collar.
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_blue.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_blue.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarBlack
name: black collar
description: A cute black collar.
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_black.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_black.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarEpi
name: epistemics collar
description: A collar showing how loyal you are to science!
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_epi.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_epi.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarEngi
name: engineering collar
description: A collar showing your deft skill utilizing your hands!
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_engi.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_engi.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarLogi
name: logistics collar
description: Who's a good courier?
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_logi.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_logi.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarMed
name: medical collar
description: Put your patients at ease by letting them know you're here to help.
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_med.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_med.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarSec
name: security collar
description: Be the best guard dog on the station!
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_sec.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_sec.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarCmd
name: Captain's collar
description: The top dog (or cat) around.
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_cmd.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_cmd.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarCC
name: CentCom collar
description: All bark with a whole lotta bite.
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_cc.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_cc.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCollarSyndi
name: Blood-Red collar
description: Sometimes you gotta be naughty.
components:
- type: Sprite
sprite: Floof/Clothing/Neck/collar_syndi.rsi
- type: Clothing
sprite: Floof/Clothing/Neck/collar_syndi.rsi
12 changes: 12 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,15 @@
- Captain
items:
- DrinkFlask

# Floofstation - Collar Addition
- type: loadout
id: LoadoutCommandCapCollar
category: Jobs
cost: 1
requirements:
- !type:CharacterJobRequirement
jobs:
- Captain
items:
- ClothingNeckCollarCmd
14 changes: 14 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/cargo.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,17 @@
min: 36000 # 10 hours
items:
- ClothingNeckCloakGoliathCloak

# Floofstation - Collar Addition
- type: loadout
id: LoadoutCargoNeckCollar
category: Jobs
cost: 1
requirements:
- !type:CharacterJobRequirement
jobs:
- CargoTechnician
- SalvageSpecialist
- Quartermaster
items:
- ClothingNeckCollarLogi
14 changes: 14 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/engineering.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,17 @@
- AtmosphericTechnician
items:
- ClothingHeadHatHardhatRed

# Floofstation - Collar Addition
- type: loadout
id: LoadoutEngineeringNeckCollar
category: Jobs
cost: 1
requirements:
- !type:CharacterJobRequirement
jobs:
- StationEngineer
- AtmosphericTechnician
- ChiefEngineer
items:
- ClothingNeckCollarEngi
16 changes: 16 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/medical.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -601,3 +601,19 @@
- Chemist
items:
- ClothingHandsGlovesChemist

# Floofstation - Collar Addition
- type: loadout
id: LoadoutMedicalNeckCollar
category: Jobs
cost: 1
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic
items:
- ClothingNeckCollarMed
14 changes: 14 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/science.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,17 @@
- Scientist
- ResearchAssistant
- ResearchDirector

# Floofstation - Collar Addition
- type: loadout
id: LoadoutScienceNeckCollar
category: Jobs
cost: 1
requirements:
- !type:CharacterJobRequirement
jobs:
- Scientist
- ResearchAssistant
- ResearchDirector
items:
- ClothingNeckCollarEpi
14 changes: 14 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/security.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -400,3 +400,17 @@
# - Oni
# items:
# - Truncheon

# Floofstation - Collar Addition
- type: loadout
id: LoadoutSecurityNeckCollar
category: Jobs
cost: 1
requirements:
- !type:CharacterJobRequirement
jobs:
- SecurityOfficer
- Warden
- HeadOfSecurity
items:
- ClothingNeckCollarSec
25 changes: 25 additions & 0 deletions Resources/Prototypes/Loadouts/neck.yml
Memeji marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -406,3 +406,28 @@
inverted: true
departments:
- Command

# Floofstation - Collar Addition
- type: loadout
id: LoadoutItemsNeckBlueCollar
category: Neck
cost: 1
exclusive: true
items:
- ClothingNeckCollarBlue

- type: loadout
id: LoadoutItemsNeckBlackCollar
category: Neck
cost: 1
exclusive: true
items:
- ClothingNeckCollarBlack

- type: loadout
id: LoadoutItemsNeckSyndieCollar
category: Neck
cost: 3
exclusive: true
items:
- ClothingNeckCollarSyndi
9 changes: 9 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1282,3 +1282,12 @@
completetime: 1
materials:
Cloth: 100

# Floofstation - Collars
- type: latheRecipe
id: ClothingNeckCollarCmd
result: ClothingNeckCollarCmd
completetime: 2
materials:
Cloth: 100
Durathread: 50
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,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Splurtstation (https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
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,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Splurtstation (https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
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.
18 changes: 18 additions & 0 deletions Resources/Textures/Floof/Clothing/Neck/collar_cc.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Splurtstation (https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
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
Loading