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

Rework Mimic as Rampant Brand Intelligence #395

Merged
merged 14 commits into from
Jul 18, 2024
Merged

Rework Mimic as Rampant Brand Intelligence #395

merged 14 commits into from
Jul 18, 2024

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented May 5, 2024 •
edited
Loading

Description

This PR was originally just going to be me fixing the stupid MobMimic bug. Over the course of 5 hours, and in a state of sleep deprived delirium, I somehow expanded this into something resembling the Rampant Brand Intelligence midround event. You're welcome I guess? I'm going to go get some sleep.

TODO

  • Re-examine this after at least 9 hours of sleep, and vomit after I read my own shitcode
  • Make it not shitcode

Changelog

🆑

  • add: Rampant Brand Intelligence has been spotted infesting NT Stations, be on the lookout for highly aggressive vending machines.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels May 5, 2024
DangerRevolution
DangerRevolution approved these changes May 5, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very cool

@VMSolidus VMSolidus marked this pull request as draft May 5, 2024 20:51
@VMSolidus VMSolidus marked this pull request as ready for review May 8, 2024 21:37
@VMSolidus
Copy link
Member Author

I am NOT going to refactor this PR any further than I already have, because I originally set out just to get the damn test fails to stop firing, and already scope creeped the shit out of this PR. So what I have here is done for now, and anything more to expand upon it will have to be a separate PR. I need to get back to doing important things like the Psionic Refactor.

@VMSolidus VMSolidus changed the title Scope Creeped Mimics Rework Mimic as Rampant Brand Intelligence May 8, 2024
@VMSolidus VMSolidus mentioned this pull request May 11, 2024
Merged
@github-actions github-actions bot added the Status: Needs Review Someone please review this label May 28, 2024
@DangerRevolution DangerRevolution added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Feature Creation of or significant changes to a feature labels May 28, 2024
DEATHB4DEFEAT
DEATHB4DEFEAT requested changes Jun 7, 2024
View reviewed changes
Content.Server/Advertise/AdvertiseComponent.cs Outdated Show resolved Hide resolved
Content.Server/Advertise/AdvertiseComponent.cs Outdated Show resolved Hide resolved
Content.Server/Advertise/AdvertiseComponent.cs Outdated Show resolved Hide resolved
Content.Server/Advertise/AdvertiseComponent.cs Outdated Show resolved Hide resolved
Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs Outdated Show resolved Hide resolved
Content.Server/Antag/MobReplacementRuleSystem.cs Outdated Show resolved Hide resolved
Content.Server/Antag/MobReplacementRuleSystem.cs Outdated Show resolved Hide resolved
Content.Server/Antag/MobReplacementRuleSystem.cs Show resolved Hide resolved
Content.Server/Antag/MobReplacementRuleSystem.cs Show resolved Hide resolved
Resources/Locale/en-US/station-events/events/rempant-brand-intelligence.ftl Outdated Show resolved Hide resolved
@DangerRevolution
Copy link
Contributor

re-requested @DEATHB4DEFEAT review because it was addressed

@DangerRevolution
Copy link
Contributor

test fail seems real; didn't look too much

VMSolidus added a commit that referenced this pull request Jun 25, 2024
@VMSolidus @Pspritechologist @DangerRevolution
Directional Animated Vendors (#400)
53b5b3a 
# Description

This PR adds in new sprites for vending machines, imported from
Baystation12. These sprites are notably different from /tg/station
sprites in that they include directional facings, and aren't just mono
direction. This allows mappers to have more variety in how they can
arrange rooms. But more importantly, it's also something that is
desperately wanted by #395 so that hostile vending machines actually
face people that they're trying to attack.


![ShareX_YQkAjaj4s8](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/a97b51e6-df31-4cb5-ba1f-47ce76eb7461)

---------

Co-authored-by: Pspritechologist <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
@VMSolidus
Copy link
Member Author

Test fail is legitimate, and I genuinely don't know what the test fail means or what it's referring to. Don't merge this please.
Also I just.. Completely forgot this PR even existed in the first place.

@DEATHB4DEFEAT
Copy link
Member

Test fail is legitimate, and I genuinely don't know what the test fail means or what it's referring to. Don't merge this please. Also I just.. Completely forgot this PR even existed in the first place.

Merged master to see if it'll succeed.

@VMSolidus
Copy link
Member Author

image
Has to do with how the Pick function works when selecting a vending machine to replace.

@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: Config Changes any configuration files Changes: Documentation Changes any xml or md 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 and removed Changes: YML Changes any yml files labels Jul 18, 2024
@VMSolidus
Revert "Fix Tests"
8e338a1 
This reverts commit cbfeeb1.
@github-actions github-actions bot added Changes: YML Changes any yml files and removed Changes: Audio Changes any ogg files Changes: Documentation Changes any xml or md files Changes: Config Changes any configuration files Changes: Sprite Changes any png or json in an RSI Changes: Workflow Changes any GitHub workflow files Changes: Map Changes any yml file in the Maps directories Changes: UI Changes any XAML files labels Jul 18, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT removed the Status: Do Not Merge Do not merge label Jul 18, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 542a708 into Simple-Station:master Jul 18, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Jul 18, 2024
@SimpleStation14
Automatic Changelog Update (#395)
9e57377
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Jul 27, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT DEATHB4DEFEAT approved these changes

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

Assignees

@VMSolidus VMSolidus

Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VMSolidus @DangerRevolution @DEATHB4DEFEAT