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

duh #4

Open
wants to merge 8,179 commits into
base: master
Choose a base branch
from
Open

duh #4

wants to merge 8,179 commits into from

Conversation

wafehling
Copy link
Owner

About the PR

Why / Balance

Technical details

Media

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link

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 Aug 23, 2024
@wafehling wafehling reopened this Aug 23, 2024
wafehling pushed a commit that referenced this pull request Aug 23, 2024
@AirFryerBuyOneGetOneFree
Merge pull request #4 from medabunny/master
b476d13 
Merge with upstream
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 1, 2024 •
edited
Loading

RSI Diff Bot; head commit 5f37c5d merging into 2fcefec
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 5f37c5d

hivehum and others added 17 commits January 25, 2025 11:58
@hivehum
made the sec blade sec contraband
74eebce
@hivehum
repoman hardsuit
d109b1f
@hivehum
Merge pull request #1481 from EpicToastTM/map-updates-01252025
90fc1d1 
Fix missing wire on Barratry
tiny fix. shocked this hasn't crashed the server
2e8dd09
@hivehum
Merge pull request #1486 from ruddygreat/tiny-mail-fix
9200895 
Tiny mail fix. shocked this hasn't crashed the server.
@mqole
Merge pull request #1483 from hivehum/markings-edits
59522f3 
back end marking edits
@mqole
displacement fixes
7f5a56e
@hivehum
rewriting history
aa14d12
@mqole
Merge pull request #1488 from hivehum/one-line
cff1b48 
history is being rewritten
@DinnerCalzone
cog fixes
1256726
@mqole
Merge pull request #1484 from hivehum/space-blade-edits
f0160a9 
space blade tweaks
@mqole
Merge pull request #1485 from hivehum/cybersun-repoman-suit
424ed4c 
repoman hardsuit
@ImpstationBot
Automatic changelog update
ff6f8ac
@mqole
oopsy
dcbc8ba
@hivehum
Merge pull request #1487 from mqole/displace
6f5b3d1 
displacement fixes
@ImpstationBot
Automatic changelog update
01111d9
@DinnerCalzone
more fixes
ca4ef95
formlessnameless and others added 30 commits February 3, 2025 21:30
@formlessnameless
fix boat
cbb5611
@formlessnameless
Merge pull request #1558 from formlessnameless/master
8ad1393 
Fix Boat
@ImpstationBot
Automatic changelog update
695391c
@honeyed-lemons
fix silly error
09b7003
@DinnerCalzone
Merge pull request #1550 from honeyed-lemons/fork-gate
a638ebd 
Forks gate
@formlessnameless
king soda and jungle juice changes
e7b72c4
@formlessnameless
Merge branch 'impstation:master' into master
e2da24f
@formlessnameless
Merge pull request #1559 from formlessnameless/master
425be63 
Jungle Juice Prevention Act
@ImpstationBot
Automatic changelog update
605e679
@Darkmajia
gray accent regex and uap fix
5607745
@Darkmajia
is she stupid
f575324
@hivehum
minor vox fixes
a655270
@hivehum
sorry ghoul lol
00449d4
@Darkmajia
dino slight rebalance, hardsuit, commander
a87a060
@formlessnameless
Merge pull request #1561 from Darkmajia/gray-accent-stuff
942b97a 
gray accent regex + uap fix
@ImpstationBot
Automatic changelog update
6a83b9b
@formlessnameless
Merge pull request #1564 from hivehum/christmas-is-over
76cd134 
removed present anom
@formlessnameless
Merge pull request #1563 from hivehum/vox-fix
623a754 
minor vox fixes
@ImpstationBot
Automatic changelog update
3ecb15f
@Darkmajia
more dino wars
8b7a8c8
@TheGrimbeeper
UAP from artifact foam
a7dde4f
@TheGrimbeeper
Merge remote-tracking branch 'upstream/master' into artifacts
bed5f60
@formlessnameless
Merge pull request #1566 from TheGrimbeeper/artifacts
283e93a 
UAP foam from artifacts
@formlessnameless
Merge pull request #1565 from Darkmajia/dino-wars-final-remix
ce9364a 
DINO WARS: FINAL REMIX
@ImpstationBot
Automatic changelog update
9c65325
@12rabbits
Reinstated buckle checks in StandingStateSystem.cs
0f94064
@Darkmajia
Merge pull request #1569 from 12rabbits/unbuckle_crit_fix
c1e742b 
Fix unbuckling after crit
@ImpstationBot
Automatic changelog update
eb78b68
@Darkmajia
Merge pull request #1557 from formlessnameless/dev
b85b42c 
Changelings Enter Stasis Automatically On Death
@ImpstationBot
Automatic changelog update
5f37c5d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Map Changes: Sprites Changes: UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.