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.

Sign up for GitHub

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

Cmo Prestige Outfits #1025

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+101 −0
Open

Cmo Prestige Outfits #1025

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1814313
Hopefully this is at least the start of getting the CMO prestige gear…
SixValentine Dec 14, 2024
e003b82
fuuuck my fucking life fuck
SixValentine Dec 14, 2024
891b751
All the new COat stuff and some changes to try and get loadouts final…
SixValentine Dec 14, 2024
eed644d
Merge branch 'impstation:master' into CMO-Prestige
SixValentine Dec 14, 2024
a310e22
Ok so this still doesn't work but at least it isn't broken. Prototype…
SixValentine Dec 14, 2024
70211b4
Merge branch 'CMO-Prestige' of https://github.com/SixValentine/imp-st…
SixValentine Dec 14, 2024
244f18d
Ok everything works even if the Labcoat is scuffed on its armor trait…
SixValentine Dec 14, 2024
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
36 changes: 36 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
role: JobChiefMedicalOfficer
time: 72000 #20 hrs

# For IMP Prestige
- type: loadoutEffectGroup
id: PrestigeCMO
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobChiefMedicalOfficer
time: 180000 #50 hrs
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we already have a 50 hour prestige loadoutEffectGroup for cmo: you can use VeteranCMO for the loadouts and delete this one since it's essentially a duplicate


# Jumpsuit
- type: loadout
id: ChiefMedicalOfficerJumpsuit
Expand Down Expand Up @@ -59,6 +69,19 @@
equipment:
neck: ClothingNeckMantleCMO

- type: loadout
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you move these loadout prototypes to the _Impstation folder?

id: CMOGreatCloak
equipment:
neck: ClothingNeckCloakCmosgreatcloak
effects:
- !type:GroupLoadoutEffect
proto: PrestigeCMO

- type: startingGear
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just for visitor roles and other entities that get spawned with clothes, so this isn't required

id: CMOGreatCloak
equipment:
neck: ClothingNeckCloakCmosgreatcloak

# Outer clothing
- type: loadout
id: ChiefMedicalOfficerLabCoat
Expand All @@ -70,6 +93,19 @@
equipment:
outerClothing: ClothingOuterWinterCMO

- type: loadout
id: CMOPrestigeLabcoat
equipment:
outerClothing: ClothingOuterCoatCMO
effects:
- !type:GroupLoadoutEffect
proto: PrestigeCMO

- type: startingGear
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto on the visitor roles thing

id: CMOPrestigeLabcoat
equipment:
outerClothing: ClothingOuterCoatCMO

# Headset
- type: loadout
id: ChiefMedicalOfficerHeadsetBasic
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,6 +1616,7 @@
loadouts:
- ChiefMedicalOfficerLabCoat
- ChiefMedicalOfficerWintercoat
- ClothingOuterCoatCMO #IMP

- type: loadoutGroup
id: ChiefMedicalOfficerNeck
Expand All @@ -1625,6 +1626,7 @@
- ChiefMedicalOfficerCloak
- ChiefMedicalOfficerMantle
- ScarfLightBlue
- ClothingNeckCloakCmosgreatcloak #IMP

- type: loadoutGroup
id: ChiefMedicalOfficerShoes
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,14 @@
sprite: _Impstation/Clothing/Neck/Cloaks/hosgreatcoat.rsi
- type: StealTarget
stealGroup: HeadCloak

- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you parent this to just ClothingCloakCmo (so, parent: ClothingCloakCmo with no need for square brackets) then you don't need to copy components like the StealTarget and it'll automatically get adjusted if the base item ever gets anything added to it

id: ClothingNeckCloakCmosgreatcloak
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pascal case for these ids pleasies

name: chief medical officer's great cloak
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pedantic, but the other greatcoats are one word: i suppose this is another type of Thing, but greatcloak might be more in-line

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pedantic, but the other greatcoats are one word: i suppose this is another type of Thing, but greatcloak might be more in-line

well notably this one is a cloak, not a greatcoat

greatcoat's just an old-fashioned word for a big fucking coat

this thing's a cape....... could call it something else i guess but just noting the difference ya

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not a great (adjective) cloak, it's a greatcloak. agreeing w dark that it would feel better if it were one word

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already been changed to one word I agree as well beacuse it matches up with Greycloak as well

description: "An ornate high collared great cloak. Good luck keeping it clean."
components:
- type: Sprite
sprite: _Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi
- type: StealTarget
stealGroup: HeadCloak
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Clothing/OuterClothing/coats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseCommandContraband]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as the previous parenting comment, but with ClothingOuterCoatLabCmo

id: ClothingOuterCoatCMO
name: Chief Medical Officer's Labcoat
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lowercase name pleasies

description: A Medical Labcoat for the Chief Medical officer. The high collar acts as a splash guard for when a patient's veins are particularly leaky.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

officer should have a capital, and medical labcoat should be lowercase too. other instances of lab coats have it as two separate words as well

components:
- type: Sprite
sprite: _Impstation/Clothing/OuterClothing/Coats/cmoprestigecoat.rsi
- type: Clothing
sprite: _Impstation/Clothing/OuterClothing/Coats/cmoprestigecoat.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for any files that have this "stop sign" at the end of them in github's "Files changed" tab, please leave a blank new line at the end of it. github hates it and it screams and it cries when you dont do this

2 changes: 1 addition & 1 deletion Resources/Prototypes/_Impstation/Loadouts/Jobs/Medical/chief_medical_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
ears: ClothingHeadsetCMOveteran
effects:
- !type:GroupLoadoutEffect
proto: VeteranCMO
proto: VeteranCMO
Binary file added ...extures/_Impstation/Clothing/Head/Hardsuits/repoman.rsi/off_equipped_HELMET.png
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repoman jumpscare

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repoman jumpscare get scared get scared get scared

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to remove all of repoman.rsi, sorry six

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not actually know how

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Textures/_Impstation/Clothing/Head/Hardsuits/repoman.rsi/on_equipped_HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...xtures/_Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi/equipped-NECK-vox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/Textures/_Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi/equipped-NECK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ces/Textures/_Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi/inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...es/Textures/_Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi/inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Resources/Textures/_Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "A prestige CMO's Cloak by SixValentine",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-NECK-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added ...ion/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/equipped-OUTERCLOTHING.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../Textures/_Impstation/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...es/_Impstation/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/_Impstation/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/_Impstation/Clothing/OuterClothing/Coats/CMOPrestigeCoat.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "WTFPL",
"copyright": "CMO Prestige Coat item by SixValentine with Attributions and edits by Kip and Beck",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added ...station/Clothing/OuterClothing/Hardsuits/repoman.rsi/equipped_OUTERCLOTHING.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rces/Textures/_Impstation/Clothing/OuterClothing/Hardsuits/repoman.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...xtures/_Impstation/Clothing/OuterClothing/Hardsuits/repoman.rsi/inhand-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...tures/_Impstation/Clothing/OuterClothing/Hardsuits/repoman.rsi/inhand-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading