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

Pact Rebase #33174

Closed
wants to merge 193 commits into from
Closed

Pact Rebase #33174

wants to merge 193 commits into from

Conversation

LukeZurg22
Copy link

Every one from the 10+ items on the list has been implemented as requested or otherwise denied after thorough consideration.

Compromises Made:

  • TC removed from secret room :: replaced w. Pyjama bag
  • Deathsquad mask in secret room renamed and its armor value removed. Mask type altered.

Changes Denied:

  • Cool brown windows next to power :: kept them. They look cool and nobody else has complained about them yet.
  • Request add power monitors to substation rooms :: No changes because every substation room already has a power monitor.

Complete List

  • Pipes and doors around cryo fixed.
  • Meteor shielding improved, but only by a little bit. (as requested)
  • Spade and Sustenance vendor added to Perma.
  • Captains room given antique pistol (it's in the locker)
  • Telecoms room made slightly bigger. (Grog was right on this one. It was very uncomfortable to look at.)
  • Telecrystals removed from secret room and replaced with something less broken but still fun.
  • Special mask no longer has armor, but now has a unique name.
  • Grilles added to bar and salvage.
  • Added borg recharger to AI room
  • Added Intellicard to AI room
  • Added Intercom next to AI (Not 100% if needed, but the requester was kind and made a fair point)
  • Northeast solars made a little nicer. Will redo southwest solars at a later date should it be needed.

@github-actions github-actions bot added S: Needs Review Indicates an item that requires a newer version of the Robust Toolbox engine. labels Nov 5, 2024
Copy link
Contributor

github-actions bot commented Nov 5, 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 added Changes: Map Should be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Nov 5, 2024
@github-actions github-actions bot closed this Nov 5, 2024
Copy link
Contributor

github-actions bot commented Nov 5, 2024

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

Resources/Textures/Mobs/Pets/weasel.rsi

State Old New Status
weasel Added
weasel_dead Added

Resources/Textures/_Weaselstation/Clothing/Head/Hats/headofchuckles.rsi

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

Resources/Textures/_Weaselstation/Clothing/Mask/headofchuckles.rsi

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

Resources/Textures/_Weaselstation/Clothing/Neck/Cloaks/headofchuckles.rsi

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

Resources/Textures/_Weaselstation/Objects/Consumable/Drinks/weh_max.rsi

State Old New Status
icon Added
icon_open Added
inhand-left Added
inhand-right Added

Resources/Textures/_Weaselstation/Objects/Fun/toys.rsi

State Old New Status
Bewitched_being Added
Panda Added

Resources/Textures/_Weaselstation/Structures/Doors/Airlocks/Abductor/abductor.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closed Added
panel_closing Added
panel_open Added
panel_opening Added
welded Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor.rsi

State Old New Status
full Added
state0 Added
state1 Added
state2 Added
state3 Added
state4 Added
state5 Added
state6 Added
state7 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_diagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_hw.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_hwcorner.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_hwcornerflip.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_jaggeddiagonal.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_jaggeddiagonalflip.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Structures/Walls/abductor_jaggedfull.rsi

State Old New Status
state0 Added
state1 Added

Resources/Textures/_Weaselstation/Tiles/abductorpod.rsi

State Old New Status
Pod1 Added
Pod2 Added
Pod3 Added
Pod4 Added
Pod5 Added
Pod6 Added
Pod7 Added
Pod8 Added
Pod9 Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Should be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. S: Needs Review Indicates an item that requires a newer version of the Robust Toolbox engine.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants