Skip to content

BSO outer wear pocket parity #600

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

Open
MallowSune wants to merge 4 commits into
base: master
Choose a base branch
from
Open

BSO outer wear pocket parity #600

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0d0d43
add pockets to bso kimono
MallowSune Feb 19, 2026
5e5811e
Added ClothingOuterStorageBase to all BSO Outer Wear
MallowSune Feb 22, 2026
4e140db
cleaning up parents per pon's advice
MallowSune Feb 24, 2026
92bc6bb
Merge branch 'master' into bso-coat-pocket-parity
NotActuallyMarty Feb 28, 2026
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/_Goobstation/Entities/Clothing/OuterClothing/armour.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@

# Blueshield Armour Vest
- type: entity
parent: [ BaseCentcommContraband, ClothingOuterArmorCaptainCarapace ]
parent: [ BaseCentcommContraband, ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase ]
Copy link
Contributor

@NotActuallyMarty NotActuallyMarty Feb 28, 2026

Choose a reason for hiding this comment

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

When changing something that is from upstream (in this case an edit in a file under _Goobstation) Mark it with a comment so that we are aware that this change is made on our end. Otherwise it is exceedingly likely to get reverted by accident as a change if upstream ever touches this file.

You would do so like this, adding a # for a comment in yaml.

Suggested change
parent: [ BaseCentcommContraband, ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase ]
parent: [ BaseCentcommContraband, ClothingOuterArmorCaptainCarapace, ClothingOuterStorageBase ] # Omu

Copy link
Contributor

@NotActuallyMarty NotActuallyMarty Feb 28, 2026

Choose a reason for hiding this comment

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

Though now that I've added this requested change i realise that it is obsolete due to the things mentioned above. Oh well, make note of this if you get to acting on requested changes.

id: ClothingBlueshieldArmourVest
name: blueshield's security armour
description: An armoured vest with the badge of the blueshield. Utilizes bluespace technology to be more compact.
Expand Down
Loading