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

Ports cheese wizards as well as summon simians(as well as some other PRs that they rely on) #385

Merged
merged 3 commits into from
Sep 27, 2023

Conversation

wraith-54321
Copy link
Collaborator

@wraith-54321 wraith-54321 commented Sep 23, 2023

About The Pull Request

Ports: tgstation/tgstation#77778
Ports: tgstation/tgstation#77196
Ports: tgstation/tgstation#76000
Ports: tgstation/tgstation#77471
Lesser summon apes has been replaced with summon simians.
The clockwork theme can roll from the midas final ritual.
Removed the apocalypse final ritual effects that just create a singalo or tesla.

Why It's Good For The Game

If new content works on TG it should work here, also refactor of bad code

Changelog

🆑
add: Replaced lesser summon apes with Summon Simians
add: CHEESE WIZARD
add: Hauntium reagent
/:cl: MrMelbert, Sealed101, dieamond13, carlarctg

@dwasint
Copy link
Collaborator

dwasint commented Sep 23, 2023

since this is a bunch of ports im gonna treat this as tm ready with minimal review
assuming it follows the prs

@wraith-54321
Copy link
Collaborator Author

it does besides some commented out stuff we dont have yet like morbid

code/datums/mood_events/generic_positive_events.dm Outdated Show resolved Hide resolved
@@ -114,6 +114,23 @@
oogas = rand(2,6)
playsound(src, 'sound/creatures/gorilla.ogg', 50)

/mob/living/simple_animal/hostile/gorilla/lesser
Copy link
Collaborator

Choose a reason for hiding this comment

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

this pains me but eh

@@ -3037,3 +3037,42 @@

if(SPT_PROB(10, seconds_per_tick))
carbon_metabolizer.set_heartattack(TRUE)

/datum/reagent/hauntium
Copy link
Collaborator

Choose a reason for hiding this comment

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

based

@dwasint dwasint merged commit 4c8651b into Monkestation:master Sep 27, 2023
20 checks passed
github-actions bot added a commit that referenced this pull request Sep 27, 2023
@wraith-54321 wraith-54321 deleted the tg-wizardzzz branch September 30, 2023 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants