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

CSS #6

Merged
merged 9 commits into from
Jan 23, 2024
Merged

CSS #6

merged 9 commits into from
Jan 23, 2024

Conversation

OCOtheOmega
Copy link
Contributor

@OCOtheOmega OCOtheOmega commented Oct 26, 2023

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Oct 26, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 26, 2023

RSI Diff Bot; head commit 068c710 merging into dccb1fa
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Ears/Headsets/service.rsi

State Old New Status
equipped-EARS Modified
icon Modified
alt-equipped-EARS Added
icon_alt Added

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
ChiefServiceSupervisor Added

Resources/Textures/Markers/jobs.rsi

State Old New Status
css Added

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-css Added
stamp-css Added

Resources/Textures/Objects/Misc/id_cards.rsi

State Old New Status
idchiefservicesupervisor Added

Resources/Textures/SimpleStation14/Clothing/OuterClothing/Coats/css_jacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/SimpleStation14/Clothing/Uniforms/Jumpskirt/css.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/SimpleStation14/Clothing/Uniforms/Jumpsuit/css.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/SimpleStation14/Objects/Devices/pda.rsi

State Old New Status
equipped-BELT Added
id_overlay Added
insert_overlay Added
light_overlay Added
pda-css Added
pda Added

Resources/Textures/SimpleStation14/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-css Added
pen_css Added
stamp-css Added

Resources/Textures/SimpleStation14/Objects/Misc/id_cards.rsi

State Old New Status
idchiefservicesupervisor Added
silver Added

Resources/Textures/SimpleStation14/Structures/Doors/Airlocks/External/service.rsi

State Old New Status
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/SimpleStation14/Structures/Storage/closet.rsi

State Old New Status
css_cabinet Added
css_cabinet_door Added
css_cabinet_open Added
generic Added
generic_door Added
locked Added
unlocked Added
welded Added

Edit: diff updated after 068c710

DEATHB4DEFEAT
DEATHB4DEFEAT previously approved these changes Oct 29, 2023
@Pspritechologist
Copy link
Member

We should discuss on #8 before merging this (or many more, even). I consider it rather important.

@DEATHB4DEFEAT DEATHB4DEFEAT added Size: 3-Medium For medium issues/PRs Status: Needs Discussion Must be discussed Status: Do Not Merge Do not merge and removed Status: Needs Review Someone please review this labels Oct 29, 2023
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Dec 17, 2023
75 tasks
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 5d53e7e into Simple-Station:master Jan 23, 2024
12 checks passed
@OCOtheOmega OCOtheOmega deleted the CSS branch January 30, 2024 18:49
DEATHB4DEFEAT added a commit that referenced this pull request Jun 2, 2024
# Description

Adds several scripts to make building and running the projects easier
outside of an IDE.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Size: 3-Medium For medium issues/PRs Status: Do Not Merge Do not merge Status: Needs Discussion Must be discussed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants