Adds bed, bedsheets and cloaks. #1022
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ComicIronic
reviewed
May 28, 2020
There's servers with a neck slot nowadays? |
|
TG and its downstreams have a neck slot. |
AJCM-git
requested changes
May 28, 2020
| @@ -80,3 +79,16 @@ | |||
| color: "white" | |||
| - type: Icon | |||
| state: wooden_chair | |||
|
|
|||
| - type: entity | |||
| name: Bed | |||
There was a problem hiding this comment.
Remember that we dont use upper case for improper nouns in names anymore (this applies to the rest of the PR)
Using lower case when needed, improving bedsheets parent
added 2 commits
May 30, 2020 13:58
|
Ready for Merge |
AJCM-git
requested changes
May 30, 2020
gradientvera
reviewed
Jun 5, 2020
| - type: entity | ||
| parent: CloakClothing | ||
| id: HosCloak | ||
| name: hos's cloak |
There was a problem hiding this comment.
Shouldn't HOS be upper case since it's an acronym? Same for QM, CE, CMO, etc...
There was a problem hiding this comment.
I believe the standard is actually HoS and HoP for those particular acronyms, but the rest are all uppercase.
rbertoche
pushed a commit
to rbertoche/space-station-14
that referenced
this pull request
Mar 16, 2023
Cherrypick 01/17
Redict
referenced
this pull request
in SerbiaStrong-220/space-station-14
May 16, 2023
Co-authored-by: faint <[email protected]>
rbertoche
pushed a commit
to rbertoche/space-station-14
that referenced
this pull request
Mar 7, 2024
…ds#1022) * Adds the Eagle. * Update eagle.yml * Update eagle.yml Fixed issues, minor touch ups, enlarged chem for new machines and merged the waiting room and breakroom * Update eagle.yml Firelocks * Update eagle.yml Perfectionist changes, very minor see comments, * Update eagle.yml Added two lv cable so the two thrusters near the airlocks turn on. Oops. * Update eagle.yml Firelock improvements. * Update eagle.yml Fixed lights. * Update eagle.yml Price increase. * Update eagle.yml Renamed button and placed a lot of cleanable dirt decals. * Replaced full specialised treatment medkits with empty --------- Co-authored-by: damia <[email protected]> Co-authored-by: Dvir <[email protected]>
rbertoche
pushed a commit
to rbertoche/space-station-14
that referenced
this pull request
Mar 7, 2024
Erisfiregamer1
pushed a commit
to The-Arcadis-Team/arc-station-14
that referenced
this pull request
Oct 16, 2024
# Description The two Psi-Potential traits are mutually exclusive(Due to adding the same component), but I forgot to add a condition that prevents you from taking both. # Changelog :cl: - fix: Fixed High & Low Psi-Potential traits lacking a requirement that you don't have the opposite trait. The two were mutually exclusive, so taking both caused issues.
Erisfiregamer1
pushed a commit
to The-Arcadis-Team/arc-station-14
that referenced
this pull request
Oct 16, 2024
Kandiyaki
pushed a commit
to Kandiyaki/space-station-14
that referenced
this pull request
Dec 30, 2024
shipyard shuttle atmos, file restructuring
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Yes you can wear the bedsheets.
So basically we don't have a neck UI slot, so i'm going to pr that a day or two from now and in that pr convert all of these things to the neck slot. For right now cloaks and bedsheets go in the backpack slot.
I'll also commit inhand sprites for the bedsheets sometime tomorrow.
Also for some fucking reason the animated states for the cult bedsheet work but the cosmos bedsheet doesn't. I swear to god I couldn't figger it out so I just left it. I'll fix it later gtfo of my face femboy.