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.

Sign up for GitHub

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

Jump to bottom

~~Stable~~ Staging merge for the grinch #34909

Merged
merged 13 commits into from
Feb 6, 2025
Merged

~~Stable~~ Staging merge for the grinch #34909

merged 13 commits into from
Feb 6, 2025
+562 −809

Conversation

VasilisThePikachu
Copy link
Member

image
Yeah, so... we can't merge master into stable for obvious reasons so uh

We merge staging in instead!

REMINDER TO SELF

Next release cycle 6824ab4292bd3a6ad874cf501005e4e3f3f7f849 is the correct before commit

Errant-4 and others added 12 commits February 2, 2025 22:56
@Errant-4
HOTFIX update staging submodule to 242.0.1 (#34833)
7579620
@Errant-4
HOTFIX revert lecter visual update #34589 (#34826)
f34233a
@impubbi
Allowed windows to be properly clicked on (#34751)
82bd0a2
@SlamBamActionman
Fix hitting through directional windows (and more!) (#34793)
f257201
@slarticodefast
Revert "Add taped logo back for 10th anniversary" (#34831)
87fa6a3
@SlamBamActionman
Hristov & .60 changes - Hristov Rework, Part 2 (#31662)
e58d031 
* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH
@Errant-4
revert engine
eb2aa08
@Errant-4
Revert "Storage sidebar fix (#34680)"
d6a9ddd 
This reverts commit 3e091c4.
@Errant-4
Revert "Storage UI V2 (#33045)"
fc80a18 
This reverts commit fd25dac.
@Errant-4
Revert "Update ScalingViewport for Engine PR (#28786)"
f2c74ef 
This reverts commit 3ad8337.
@VasilisThePikachu
Emisse told me I can name it the grinch (#34905)
6824ab4
@VasilisThePikachu
Merge branch 'master' of ssh://github.com/space-wizards/space-station…
36e42fb 
…-14 into staging
@github-actions github-actions bot added size/L Denotes a PR that changes 1000-4999 lines. S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: UI Changes: Might require knowledge of UI design or code. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Feb 6, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 6, 2025 •
edited
Loading

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

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

State Old New Status
base Modified
bolt-open Modified
equipped-BACKPACK Modified
equipped-SUITSTORAGE Modified
icon Modified
inhand-left Modified
inhand-right Modified
mag-0 Modified
wielded-inhand-left Modified
wielded-inhand-right Modified

Edit: diff updated after 0c2baf9

@VasilisThePikachu VasilisThePikachu merged commit 434d158 into master Feb 6, 2025
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalgearsloth metalgearsloth Awaiting requested review from metalgearsloth metalgearsloth is a code owner

Assignees
No one assigned
Labels
Changes: Sprites Changes: Might require knowledge of spriting or visual design. Changes: UI Changes: Might require knowledge of UI design or code. S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/L Denotes a PR that changes 1000-4999 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@VasilisThePikachu @Errant-4 @impubbi @SlamBamActionman @slarticodefast