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

Ranching: A new Horizon #2017

Merged
merged 79 commits into from
Jun 13, 2024
Merged

Ranching: A new Horizon #2017

merged 79 commits into from
Jun 13, 2024

Conversation

dwasint
Copy link
Collaborator

@dwasint dwasint commented May 26, 2024

About The Pull Request

ports horns from: NovaSector/NovaSector#1188, if anyone knows the pr link to the og pr please lmk so i can credit that

Why It's Good For The Game

Changelog

🆑
fix: chicks getting happiness reset
add: chugging, drag a cup onto you and start chugging
change: a rooster is now required in order for chickens to lay fertile eggs
/:cl:


mobs_to_pick += return_donator_mobs()

if(!patreon.has_access(ACCESS_ASSISTANT_RANK) && !is_admin(src) && !length(mobs_to_pick))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
if(!patreon.has_access(ACCESS_ASSISTANT_RANK) && !is_admin(src) && !length(mobs_to_pick))
if(!length(mobs_to_pick || (!patreon.has_access(ACCESS_ASSISTANT_RANK) && !is_admin(src))))

im pretty sure this means the first 2 checks are useless

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

These do the exact same thing.

var/list/spawned_mobs = list()
var/list/deletors = list()
for(var/mob/living/basic/basic as anything in mobs_to_pick)
var/mob/living/basic/created = new basic()
Copy link
Collaborator

Choose a reason for hiding this comment

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

I suggest using static vars to avoid spawning in the mobs every time

if(!choice)
spawned_mobs = null
QDEL_LIST(deletors)
return pick(basic_list)
Copy link
Collaborator

Choose a reason for hiding this comment

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

this makes it so you cant cancel out of becoming a mob


mob.mind.transfer_to(created_mob, TRUE)

if(patreon.has_access(ACCESS_NUKIE_RANK) || is_admin(src))
Copy link
Collaborator

Choose a reason for hiding this comment

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

not a huge fan of this, seems like it could lead to issues

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was requested in the design doc I was given so its not being removed

if(!mob.mind)
mob.mind = new /datum/mind(key)

mob.mind.transfer_to(created_mob, TRUE)
Copy link
Collaborator

Choose a reason for hiding this comment

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

if this is taking from an observer then this needs to do a key transfer instead as this keeps antag status from previous lives

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Also part of the design doc from what I can see. This prevents you from ghost crittering dying, then your main body getting ressed and losing antag status


if(ghost.client.ghost_critter_cooldown > world.time)
return

Choose a reason for hiding this comment

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

Could use a confirmation prompt here, you can genuienly be a new player, click on the structure to examine it and without a warning accidentally become a critter
Also maybe a description would be good

@dwasint dwasint merged commit 0a89554 into Monkestation:master Jun 13, 2024
18 of 19 checks passed
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.

None yet

4 participants