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

Parrottai #34

Merged
merged 11 commits into from
Nov 13, 2023
Merged

Parrottai #34

merged 11 commits into from
Nov 13, 2023

Conversation

Ben10Omintrix
Copy link

@Ben10Omintrix Ben10Omintrix commented Nov 13, 2023

About The Pull Request

perch code wasnt working so i had to fix it and moved some signals around
listen and repeat component wasnt working. i fixed it and moved some of its behavior to the ai subtree. had to create a new signal sent by /Hear to make it work.
i had to rewrite the parrotpossession disease to make it work with ghost poly, but im p sure theres some work still to be done on it
made some new generic ai behaviors for parrots but could be useful for future mobs.
sentient parrots were also unable to drop their items so i gave them that ability
gave ghost poly the ability to possess people. it now also applies a cool haunted filter to people it possesses
changed the handling of held_items to /Exited
changed all traces of the simple_animal subtype from the code and changed it with the basic type
i changed twitterize() to work with basic poly, but i think it needs some testing still
re-arranged some checks and added some early return to some of the on_click/perching/pre attack procs

all in all i tried my best to leave little left for u to do  but uni been kicking my ass thes edays

Why It's Good For The Game

Changelog

🆑
add: Added new mechanics or gameplay changes
add: Added more things
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
sound: added/modified/removed audio or sound effects
image: added/modified/removed some icons or images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

Ben10Omintrix and others added 7 commits November 7, 2023 17:23
## About The Pull Request

Wrong turf type and a missing turf on surface mining site, as well as
some jungle turfs on the golem ship which causes atmos differences.
## Why It's Good For The Game

Fixes tgstation#79624
better init time
## Changelog
:cl:
fix: Removes some roundstart active turfs.
/:cl:
@san7890
Copy link
Owner

san7890 commented Nov 13, 2023

image

isn't this stuff that I brought back? fix conflicts i think something's cooked here

MrMelbert and others added 4 commits November 12, 2023 23:42
## About The Pull Request

If you attempted to use the shielded component properly (applying it in
`Init`), it would not work because the equipped signal was improperly
passing its arguments to `set_wearer`.

The only reason why this worked now is that every consumer added the
component after it was `equipped`... usually in `equipped`.

This also meant shielded items that added it in equipped were open to an
exploit, allowing you to reset the charges by unequip / re-equip.

## Changelog

:cl: Melbert
fix: Fixes some potential exploits and issues involving shielded
equipment.
/:cl:
Copy link
Owner

@san7890 san7890 left a comment

Choose a reason for hiding this comment

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

i'll fix these myself. i think everything else is fine but the diff is weird so i'll just merge this and do a cheeky rebase so i can get a cleaner diff. thanks again


AddComponent(/datum/component/listen_and_repeat, get_static_list_of_phrases(), speech_blackboard_key, speech_probability_rate, speech_shuffle_rate)
ai_controller.set_blackboard_key(BB_IGNORE_ITEMS, ignore_items)
AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/cracker), tame_chance = 100, bonus_tame_chance = 0, after_tame = CALLBACK(src, PROC_REF(tamed)))
Copy link
Owner

Choose a reason for hiding this comment

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

this needs to be multillined

@@ -276,7 +276,7 @@
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
/mob/living/simple_animal/parrot,
/mob/living/basic/parrot,
Copy link
Owner

Choose a reason for hiding this comment

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

i gotta alphabetize this

@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
/mob/living/basic/chick,
/mob/living/basic/chicken,
/mob/living/basic/pet/penguin,
/mob/living/simple_animal/parrot,
/mob/living/basic/parrot,
Copy link
Owner

Choose a reason for hiding this comment

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

i'll alphabetize this

@san7890 san7890 merged commit c4e0af9 into san7890:parrot-rework Nov 13, 2023
1 check passed
@san7890
Copy link
Owner

san7890 commented Nov 13, 2023

anyways i figured out the reason that it was so weird, the branch wasn't up to date with master while yours was. ugh. it's fixed now and the diff is clean

san7890 pushed a commit that referenced this pull request Nov 15, 2023
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.

5 participants