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

[MIRROR] [modular] Adds hair ties #1023

Merged
merged 1 commit into from
Dec 7, 2023
Merged

[MIRROR] [modular] Adds hair ties #1023

merged 1 commit into from
Dec 7, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#24806

About The Pull Request

Adds a few hair ties, one which is printable, and one which is a Syndicate gadget.
Maybe I'll give the sprites a serious attempt later!

How This Contributes To The Skyrat Roleplay Experience

Fun little roleplay and character customization thing.

Proof of Testing

dreamseeker_ErISw4i1ke.mp4

Changelog

🆑 honkpocket
add: Adds various hair ties, they hold up your hair.
/:cl:

* init

* temp icon and population

* text

* rename + subtype friendly code

* syndie ver

* sprites

* ci

* review

* forgor

* test

* re-do review

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 63d0f17 into master Dec 7, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-24806 branch December 7, 2023 17:44
AnywayFarus added a commit that referenced this pull request Dec 7, 2023
Iajret pushed a commit that referenced this pull request Feb 18, 2024
)

* Changes airlock access for a couple of doors on birdshot (#81497)

## About The Pull Request
Its probably unintended that the maint door above tool storage only had
'cargo' access instead of cargo and maint access. It now has cargo and
maint access.


![image](https://github.com/tgstation/tgstation/assets/54517726/14996005-27d9-4c0d-8044-f9fb04328dc8)
Also the CC dock on birdshot has only bridge access on it, officials and
the like dont have bridge access so i added general CC access so they
can go in and out instead of using maints

![image](https://github.com/tgstation/tgstation/assets/54517726/d372229f-4587-4151-8a8a-6e5665bf30a8)
## Why It's Good For The Game
Probably unintended and people wont get confused as to why it wont open
## Changelog
:cl:

fix: The door above tool storage on birdshot now has maintenance access
on it and officials can now enter the CC dock room.

/:cl:

* Changes airlock access for a couple of doors on birdshot

---------

Co-authored-by: rageguy505 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants