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

Getting up to date #396

Closed
wants to merge 28 commits into from
Closed

Getting up to date #396

wants to merge 28 commits into from

Conversation

Eagle-0
Copy link
Contributor

@Eagle-0 Eagle-0 commented May 6, 2024

There were like 50 EE commits that we didn't have (Which we need to test out languages)

Eagle-0 and others added 28 commits April 24, 2024 19:28
Saltern Redux, Interdyne hand-me-downs
Part 1 Gorlax Re-Equipping, Terragov Dropship
…cate ones

renamed nukeops consoles to mention terragov instead of syndicate
Copy link
Contributor

github-actions bot commented May 6, 2024

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 May 6, 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 May 6, 2024
Copy link
Contributor

github-actions bot commented May 6, 2024

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

Resources/Textures/Clothing/Head/Hats/hopcap.rsi

State Old New Status
equipped-HELMET Modified
icon Modified

Resources/Textures/Clothing/Head/Soft/bluesoft.rsi

State Old New Status
equipped-HELMET Modified

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

State Old New Status
equipped-NECK Modified
icon Modified
inhand-left Modified
inhand-right 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/somgloves.rsi

State Old New Status
equipped-HAND 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/Clothing/Head/Helmets/somhelm.rsi

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

Resources/Textures/Clothing/Head/Helmets/somleaderhelm.rsi

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

Resources/Textures/Clothing/OuterClothing/Coats/hop_coat.rsi

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

Resources/Textures/Clothing/OuterClothing/Misc/sonsheavy.rsi

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

Resources/Textures/Clothing/OuterClothing/Misc/sonsmedium.rsi

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

Resources/Textures/Clothing/Shoes/Boots/somboots.rsi

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

Resources/Textures/Clothing/Uniforms/Jumpsuit/somuniform.rsi

State Old New Status
equipped-INNERCLOTHING 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

Resources/Textures/Objects/Weapons/Guns/Battery/vol_rifle.rsi

State Old New Status
base Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Rifles/som_rifle.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added

@Eagle-0
Copy link
Contributor Author

Eagle-0 commented May 6, 2024

Gruh

wrong repo?

@stellar-novas
Copy link
Contributor

Indeed

Though it got auto closed for a valid reason, same thing will happen on the syndie station repo.

You can't merge from master, it has to be a different branch.

Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Dec 15, 2024
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