Skip to content

Pentest, the Pajamasing#502

Merged
Ossa88 merged 8 commits intoPentestSS13:masterfrom
HanSolo1519:patch-1
Jan 30, 2026
Merged

Pentest, the Pajamasing#502
Ossa88 merged 8 commits intoPentestSS13:masterfrom
HanSolo1519:patch-1

Conversation

@HanSolo1519
Copy link
Copy Markdown
Contributor

About The Pull Request

Simply adds pajamas to the Loadout and Clothesmate vending machines

Why It's Good For The Game

Even CLIF conscripts need to be cozy somtimes.

Changelog

🆑
add: Added Pajamas to Loadout and Clothesmate.
/:cl:

@Ossa88 Ossa88 added the Modularization Requested Additional Modularization might be required/requested or fixes to modularization. label Jan 17, 2026
display_name = "dress-suitskirt, navy"
path = /obj/item/clothing/under/suit/dresssuit/skirt

/datum/gear/uniform/suit/dress_suit/skirt
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Need unique path

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Also should be modularized as per modular_pentest standards

display_name = "pajamas, red"
path = /obj/item/clothing/under/misc/pj/red

/datum/gear/uniform/suit/dress_suit/skirt
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Need unique path

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Also should be modularized as per modular_pentest standards

Comment thread code/modules/vending/clothesmate.dm Outdated
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
/obj/item/towel = 3,
/obj/item/clothing/mask/breath/facemask =3)
/obj/item/clothing/mask/breath/facemask = 3,
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Also should be modularized as per modular_pentest standards as a var edit

Copy link
Copy Markdown
Contributor Author

@HanSolo1519 HanSolo1519 Jan 17, 2026

Choose a reason for hiding this comment

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

Could you point me in the right direction with this? This is my first time dealing with a codebase that handles an upstream frequently. Is it simply '//Pentest edit start' and '//Pentest edit end'?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh its easy, I can do it for you once I finish my current project.

@github-actions github-actions Bot requested a review from Ossa88 January 20, 2026 07:23
@Ossa88 Ossa88 added this pull request to the merge queue Jan 29, 2026
Merged via the queue into PentestSS13:master with commit 3045fc7 Jan 30, 2026
16 checks passed
Ossa88 added a commit that referenced this pull request Jan 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Change DME Edit Modularization Requested Additional Modularization might be required/requested or fixes to modularization.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants