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

New Shuttle #346

Closed
wants to merge 6 commits into from
Closed

New Shuttle #346

wants to merge 6 commits into from

Conversation

Reese1243
Copy link
Contributor

new terragov shuttle fr fr

Copy link
Contributor

Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation

You can move your current work from the master branch to another branch by doing git branch <branch_name and resetting the master branch.

@github-actions github-actions bot closed this Apr 29, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI labels Apr 29, 2024
@Eagle-0
Copy link
Contributor

Eagle-0 commented Apr 29, 2024

YOU DOLT

@VMSolidus
Copy link
Member

8db2b31e-66ee-45bf-b004-d2890fb58482

Copy link
Contributor

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

Resources/Textures/Clothing/Neck/Cloaks/cap.rsi

State Old New Status
equipped-NECK Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
open Modified
opening Modified

Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
open Modified
opening Modified

Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
closing_unlit Modified
deny_unlit Modified
open Modified
opening Modified
opening_unlit Modified
panel_open Modified
sparks Modified
welded Modified
assembly-fill Removed
assembly-glass Removed
closed-fill Removed
closed-glass Removed
closing-fill Removed
closing-glass Removed
opening-fill Removed
opening-glass Removed
panel_closing Added
panel_opening Added

Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
open Modified
opening Modified

Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
open Modified
opening Modified

Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
open Modified
opening Modified

Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi

State Old New Status
closing Modified

Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi

State Old New Status
assembly Modified
closed Modified
closing Modified
open Modified
opening Modified

Resources/Textures/Clothing/Back/Backpacks/syndiecap.rsi

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

Resources/Textures/Clothing/Hands/Gloves/syndicatecap.rsi

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

Resources/Textures/Mobs/Customization/IPC/ipc_head_accessories.rsi

State Old New Status
antennae Added
antlers Added
bishop_alt_optics Added
crowned Added
cyberhead Added
droneeyes Added
light Added
sidelights Added
tesla Added
tvantennae Added

Resources/Textures/Mobs/Customization/IPC/ipc_optics.rsi

State Old New Status
morpheus_alt_optics Added
optics Added
wardtakahashi_alt_optics Added
xion_alt_optics Added

Resources/Textures/Mobs/Customization/IPC/ipc_screens.rsi

State Old New Status
blank Added
blue Added
breakout Added
console Added
ecgwave Added
eight Added
excla Added
eyes Added
eyesangry Added
eyesstall Added
goggles Added
goggles_hesp_alt Added
gol_glider Added
green Added
heart Added
l Added
loading Added
monoeye Added
music Added
nature Added
off_hesp_alt Added
orange Added
orange_hesp_alt Added
pink Added
pink_hesp_alt Added
purple Added
question Added
rainbow Added
rainbow_hesp_alt Added
rainbowdiag Added
red Added
redtext Added
rgb Added
rgb_hesp_alt Added
ring Added
sad Added
screenwave Added
scroll Added
scroll_hesp_alt Added
shower Added
sinewave Added
smile Added
smoking Added
stars Added
static Added
test Added
tetris Added
textdrop Added
tv Added
waiting Added
windowsxp Added
yellow Added

Resources/Textures/Mobs/Species/IPCs/organs.rsi

State Old New Status
posibrain Added

Resources/Textures/Mobs/Species/IPCs/parts.rsi

State Old New Status
chest Added
head Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added

@DEATHB4DEFEAT
Copy link
Member

lmao

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants