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

Catch-Up Cherry Pick 2 #944

Merged
merged 442 commits into from
Oct 14, 2024
Merged

Catch-Up Cherry Pick 2 #944

merged 442 commits into from
Oct 14, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Sep 21, 2024 •
edited
Loading

Description

Picked 400 commits (and skipped many, many more) from WizDen since #540.
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor).

TODO

  • Pick
  • Compile
  • Fix runtime errors
  • Fix up humanoid profile editor
  • Test everything

Changelog

🆑

  • add: Merged 400 WizDen PRs. Happy testing!

Plykiya and others added 30 commits September 14, 2024 16:56
@Plykiya @DEATHB4DEFEAT
Hardsuits, EVA suits, Firesuits, and others now protect your feet fro…
60cd0af 
…m Glass Shards (#26764)

* Hardsuits and softsuits count as having shoes for step triggers

* Add softsuit tag prototype

* Change to suitEVA tag

* Get rid of softsuit tag, found suitEVA tag

* Full pass of ShoesRequiredStepTriggerImmune

* Adds check to outerClothing for ShoesRequiredStepTriggerImmune

* return

* fuck Dionas

* Convert to comp, space dragons immune as well

* Merge conflict

* Merge conflict

* fix leftover tags

* empty spaces

* turns out the dragon didn't need it

* minor optimization

* Add access for system, add comp to baseShoes, check slotflags for every slot besides pockets

* fix

* fuck it we ball

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 0efcd30ac6d58fe0a24565c3ddd102277997fbba)
@FungiFellow @DEATHB4DEFEAT
Bows fit on Airtank Slot (#27433)
59032bf 
Update bow.yml

(cherry picked from commit 1efdf4a40a434e52a7c909e496c0675fef406ee4)
@osjarw @DEATHB4DEFEAT
DelayedForce and Rapid anom behaviors fixed (#27435)
9bccd47 
(cherry picked from commit f3e9db014194d7517bb1ae1188c71553bb49b893)
@UbaserB @DEATHB4DEFEAT
New plant mutation: Pyrotton (#27200)
29dec24 
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent

(cherry picked from commit 008935f6ec6f9cd5c56e943a5ce02c1f54cec893)
@beck-thompson @DEATHB4DEFEAT
Fixed some mop .ftl capitalization (#27447)
a86bf36 
(cherry picked from commit 2135cbdb23ccd73236a008512ae6d788c88f206b)
@Plykiya @DEATHB4DEFEAT
Make Smile the Slime grabbable like geras (#27458)
589075f 
Make smile grabbable like geras

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 4416a21dd529768472de7f0f76a78a5b39f39b24)
@Plykiya @DEATHB4DEFEAT
Fix doubled gas mask action message (#27463)
120b837 
Fix doubled message

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 405e020bfa1d5990b86a7dfa69d0f70711d54a0d)
@beck-thompson @DEATHB4DEFEAT
Infinate chem dupe fixed (Toilet, drain) + dirty water toilet fix (#2…
eb99834 
…7446)

innital commit

(cherry picked from commit cdd900cef65cda204c34a00d7309656e10bb2d09)
@ElectroJr @DEATHB4DEFEAT
Move UnpoweredFlashlight to shared (#27449)
220d9ad 
(cherry picked from commit a466b35b275c48294cb465aa7c9ca50b7b4ea75f)
@ElectroJr @DEATHB4DEFEAT
Stop admin verb pop-in (#27450)
6a884cb 
(cherry picked from commit 1eb81427d38ffd063f823df01853f5e8a1584a0d)
@Nopey @DEATHB4DEFEAT
Allow more items to be recycled (#24435)
05f16e4 
Give more items a PhysicalComposition for recycling

(cherry picked from commit 5118865d475ee329ea75e4e754d27597ac82edd6)
@Hanzdegloker @DEATHB4DEFEAT
HoP and QM Stamps (#25604)
8b03097 
the meat and potatoes

yup

(cherry picked from commit 33e1752a49ebaad3552385ddcf4f299a1040289b)
@SpaceLizardSky @DEATHB4DEFEAT
Senior physician sleeve symmetry (#27016)
921c535 
* weh.

* get the weh out of my repository

* add best lizard figurine

* remove umbra stuff from master

* sprite time!!

* revert stuff?

* newer spritesss

(cherry picked from commit 9cb3287de4225eda4debca77c37fdb6602dad5ad)
@potato1234x @DEATHB4DEFEAT
Rainbow Weed (#25759)
3aeaf25 
* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents

(cherry picked from commit cd90c05ce58d0b8ce48c3ea4fcf960ecc89b88ae)
@ElectroJr @DEATHB4DEFEAT
ActivatableUI tweaks (#27448)
eec26b0 
* ActivatableUI tweaks

* EntGotRemovedFromContainerMessage

* A

(cherry picked from commit 7c7d8eb645010f02faccd6394f1229ce130e81dc)
@Deeeeja @DEATHB4DEFEAT
Adding new Cryogenics Reagent - Opporozidone (Attempt 2) (#24074)
e7e958e 
* Fixing mistakes

* How did I make the same mistake twice

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit eb41f1da5fd6cf5aec3e596dd1b6f381e037836c)
@Mangohydra @DEATHB4DEFEAT
Martyr Cyborg Module, borg law 2 explode (#25815)
2b7e555 
* borg law 2 explode

* attributions fix + CL fix

* please dear god work i beg you

* maybe this will work :godo:

* 50% off deal + disc change

* absolving merge conflict

* merge conflict fix

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml

* Apply suggestions from code review

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 8afae8a1f14d0f935b25470ece5a38e6ddeaa6ac)
@TsjipTsjip @DEATHB4DEFEAT
Update PR Labeler to v5 (#26845)
a2149e9 
* Update PR Labeler to v5

* Change conflict labeler.

* Implement draft filtering functionality

* Actually, pull_request_target is appropriate here.

(cherry picked from commit aab103865e006abe9c4117436d705ad697553eba)
@lzk228 @DEATHB4DEFEAT
Add more telecomms variations (#26822)
ab323d3 
* Add more telecomms variations

* fox :fox:

* oops

(cherry picked from commit eb9ee4541f5cd03a41c9f0878bacb5e6b58736f0)
@SlamBamActionman @DEATHB4DEFEAT
Tippy, the helpful hint clown! (#26767)
245897f 
* Tippy is BACK

* Clean up clippy from aprils fools

* Changed names from clippy to tippy, added localization, removed local_clippy command, made it easier to target a specific player

* Rename clippy.yml to tippy.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 373c368b94de808ff8da1f9956b489daecee64d8)
@Morb0 @DEATHB4DEFEAT
Emotes Menu (#26702)
d564686 
* Basic emote radial menu

* Move out from corvax

* Move to UI controller & add to top menu bar and key bind

* Make emote play

* Add name localization for emotes

* Localize chat messages

* Fix emote menu

* Add categories localization

* Fixes

* Fix

* Add emotes entity blacklist

* Fix entity whitelist required all logic

* Remove unused wagging emote

* Revert sprite

* Set default texture for emote icon

* Update Resources/keybinds.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 16b3e2233a43ce5130d000f5ac7a57d9d2509cdd)
@MilenVolf @DEATHB4DEFEAT
New borg sounds (#27205)
3dd90e4 
* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor

(cherry picked from commit 7ee18433c8936dd053a1f9dad652c3d2a0d2cb30)
@KrasnoshchekovPavel @DEATHB4DEFEAT
fixed formatting of floating point numbers during localization (#27441)
72873b6 
(cherry picked from commit 199e05fb341a68ea1cf499f9e3c35b6c0cd5e22f)
@Plykiya @DEATHB4DEFEAT
Late join thieves! (#27466)
b22f0c8 
Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 7dae58c9f84e3ebaeaebaa09e51626f35675e55d)
@ElectroJr @DEATHB4DEFEAT
Action UI fixes (#27468)
ac62211 
(cherry picked from commit 6471f55a49c2548e437a1a101f92c3416c676893)
@metalgearsloth @DEATHB4DEFEAT
Tippy fixes (#27475)
7d92861 
How does that UISystemDependency not crash.

(cherry picked from commit 6d619c942071390243d101d02f492ae038152305)
@ElectroJr @DEATHB4DEFEAT
Content changes for engine exception tolerance PR (#27455)
5eedff1 
* Content changes for engine exception tolerance PR

* Poke tests

(cherry picked from commit 3c154abb5bd9a1e21e3d2f3efb61c338bb6cd608)
@metalgearsloth @DEATHB4DEFEAT
Update submodule to 221.0.0 (#27477)
2c525a2 
(cherry picked from commit 569253940ff12a827f30062399b3c0475dc25b50)
@EmoGarbage404 @DEATHB4DEFEAT
Fix position swapping with QSI and artifacts (#26364)
3792533 
(cherry picked from commit e2087115af9a5d4a2062fd640886dfcee9e5814e)
@metalgearsloth @DEATHB4DEFEAT
Fix snappop (#27264)
82afa59 
* Fix snappop

Bunch of stuff slipped through.

* name

(cherry picked from commit 386454706b71bd047dc14abd869b9c0dea2a8e18)
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 9, 2024

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 13, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Oct 14, 2024
@VMSolidus
Copy link
Member

image

This was the only bug I could find that wasn't pre-existing.

@VMSolidus
Copy link
Member

Fuck it let's go.

@VMSolidus VMSolidus merged commit 1e60b75 into Simple-Station:master Oct 14, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Oct 14, 2024
@SimpleStation14
Automatic Changelog Update (#944)
4d2a6d8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist Pspritechologist was automatically assigned from Simple-Station/ee-maintainers

@VMSolidus VMSolidus Awaiting requested review from VMSolidus

Assignees

@VMSolidus VMSolidus

@DEATHB4DEFEAT DEATHB4DEFEAT

Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Config Changes any configuration files Changes: Documentation Changes any xml or md 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 Changes: UI Changes any XAML files Changes: Workflow Changes any GitHub workflow files Priority: 2-High Needs to be resolved as soon as possible Size: 1-Very Large For especially large issues/PRs Status: Do Not Merge Do not merge Status: Help Wanted Extra attention is needed Status: Needs Cleanup Someone has to clean this before merging Type: Bug [Un]intentional issue with something Type: Cleanup Like Rework but small Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.