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

Updates La Luna, Pinnochio for Rcorp and playables, gives minions NV on Rcorp AND moves CheckCombat to simple_animal. #1621

Merged
merged 6 commits into from
Nov 11, 2023

Conversation

TaculoTaculo
Copy link
Collaborator

@TaculoTaculo TaculoTaculo commented Nov 11, 2023

About The Pull Request

Title, makes those abnormalities more user friendly for the people playing them by making the current person possesing the abnormality get his mind transferred to the created mob, and makes them able to be added Rcorp gamemode (DO NOT ADD PINOCCHIO AS IS, HE CAN JUST PRESS THE BUTTON), Pinocchio did not work well with night vision so he gets a seclite, and also gives multiple minions night vision capabilities, also disables pinnochio's ai if someone is controlling it.

It also now moves CheckCombat to simple animals and removes it from _distortions and _abnormality to enable basically every simple mob to call it.

Why It's Good For The Game

Makes possesing Pinocchio and La Luna better.
More Rcorp abnos!
Night vision is good for abnormalities, makes it less of a suffering to experience the game as a minion.
CheckCombat being applied to things other than abnos makes it easier to change non abnormalities for side gamemodes

Changelog

🆑
add: Added nightvision to a few minion mobs
code: Changed CheckCombat location to simple_animal
remove: Removed CheckCombat from _distortion and _abnormality
tweak: Made La Luna and Pinnochio compatible with Rcorp and playables better.
tweak: Adds some combat and client checks to Pinnochio and La Luna
fix: Fixed playables pinnochio ai issues
/:cl:

adds nv combat checks to
nosferatu bats
ml slimes
censored minis
tbird spawns
la luna spawned mob

adds mind transfer to pinocchio and la luna
add check for combat to initialize ai controllers for pinocchio, gives him a seclite on rcorp
add check for combat to spawn the breached la luna mob on its position instead of in a random department and to disable the timer.

makes pino ai disabled while a client is possesing it.
@TaculoTaculo TaculoTaculo self-assigned this Nov 11, 2023
@TaculoTaculo TaculoTaculo added Tweak A small change/addition to already existing systems. Side content This PR affects side modes. labels Nov 11, 2023
@TaculoTaculo TaculoTaculo changed the title Updates La Luna, Pinnochio for Rcorp and playables, gives minions NV on Rcorp. Updates La Luna, Pinnochio for Rcorp and playables, gives minions NV on Rcorp AND moves CheckCombat to simple_animal. Nov 11, 2023
Comment on lines 189 to 192
//Side Gamemodes stuff, gives minions nightvision on Rcorp.
if(CheckCombat())
var/obj/effect/proc_holder/spell/targeted/night_vision/bloodspell = new
AddSpell(bloodspell)
Copy link
Member

Choose a reason for hiding this comment

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

I think you can just move it to simple mobs in general, to avoid copy-pasted code for various minions/ordeals.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Will do

moves the nightvision checks to simple_animal

removes the checks from censored, luna, tbird, ml, nosferatu
Copy link
Member

@EgorDinamit EgorDinamit left a comment

Choose a reason for hiding this comment

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

Rename the CheckCombat proc in another PR.

@EgorDinamit EgorDinamit merged commit e23ea7b into vlggms:master Nov 11, 2023
7 checks passed
@TaculoTaculo TaculoTaculo deleted the i-wanna-be-a-real-boy branch November 11, 2023 17:33
vampirebat74 pushed a commit to vampirebat74/lobotomy-corp13 that referenced this pull request May 10, 2024
…on Rcorp AND moves CheckCombat to simple_animal. (vlggms#1621)

* Adds Everything

adds nv combat checks to
nosferatu bats
ml slimes
censored minis
tbird spawns
la luna spawned mob

adds mind transfer to pinocchio and la luna
add check for combat to initialize ai controllers for pinocchio, gives him a seclite on rcorp
add check for combat to spawn the breached la luna mob on its position instead of in a random department and to disable the timer.

makes pino ai disabled while a client is possesing it.

* removes one line

* Changes CheckCombat location, applies it to all minions.

* Makes button refuse pino.

fuck you pinocchio

* moves blocking code to pinocchio's

* moves the nightvision checks to simple_animal

moves the nightvision checks to simple_animal

removes the checks from censored, luna, tbird, ml, nosferatu
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Side content This PR affects side modes. Tweak A small change/addition to already existing systems.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants