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

Adds Dionae to the game #10919

Merged
merged 159 commits into from
Sep 22, 2024
Merged

Adds Dionae to the game #10919

merged 159 commits into from
Sep 22, 2024

Conversation

XeonMations
Copy link
Contributor

@XeonMations XeonMations commented Apr 25, 2024

About The Pull Request

Completes the dionae bounty (https://github.com/BeeStation/BeeStation-Hornet/discussions/10901), adds them to the game.

Majority of the code was ported from https://github.com/PolarisSS13/Polaris (Which is a fork of baystation, and neither of those repos actually have a PR that i can link that specifically add dionae, im now finding... Sorry!)

Credits to SS14's space-wizards/space-station-14#11497 PR for the eyes, brain, stomach and ears icons, as well as the main limbs and how the dionae look.

Credits to DungeonVR and Luxlator for the remaining sprites! (sadly i cant find their github accounts, but they're active in the discord, so i hope this is fine)

(The species was accepted by maintainers, ask @WhereAmO , im just here to code them in)

Why It's Good For The Game

image

Testing Photographs and Procedure

Screenshots&Videos

image

image

image

image

image

image

image

image

image

image

image

image

image

image

Changelog

🆑 EmoGarbage404, XeonMations, WhereAmIO, DungeonVR, Luxlator, Rukofamicom
add: Added Dionae to the game, a multi-organism plant person!
tweak: Changed all declarations from podperson to diona
remove: Removed Podperson plants from the game
add: New species trait: TRAIT_NORADDAMAGE
add: You can now grow nymphs in botany trays via nymph seeds, which replace podperson plants! Dead nymphs may also be planted to regrow a new one!
/:cl:

@github-actions github-actions bot added the Mapping DMM Change label Apr 25, 2024
@WhereAmO
Copy link
Contributor

Oh yeah! So some servers have em enjoy radiation as well which shouldn't be terrible op here, also I think they usually starve and die when not in light (after some time), also also flash weakness? Saaaave for that the only big thing is the Dionea Nymph stuff for when they explode into bugs when they die. Also player panel stuff and probably a bunch of other things, but I am on phone and GitHub sucks on it lmao.

Also also also thanks for putting up a draft so quick!

@WhereAmO
Copy link
Contributor

@PowerfulBacon Hey just quickly poking you, were you thinking the idea with the Diona Nymphs being a plantable-respawn role thingy was a good idea?

@PowerfulBacon
Copy link
Member

@PowerfulBacon Hey just quickly poking you, were you thinking the idea with the Diona Nymphs being a plantable-respawn role thingy was a good idea?

Yea, that sounds fine to me. Although they explicitly aren't respawns for your previous body (if you choose to enter your own planted pod) and will make you become a different person when spawning through them.

@WhereAmO
Copy link
Contributor

@PowerfulBacon Hey just quickly poking you, were you thinking the idea with the Diona Nymphs being a plantable-respawn role thingy was a good idea?

Yea, that sounds fine to me. Although they explicitly aren't respawns for your previous body (if you choose to enter your own planted pod) and will make you become a different person when spawning through them.

Yeah, so it'd be fine if it worked like "Seed Planted in Botany Tray > Plant Grows > Ghostroll Prompt > New Body + Memories/Etc"?

Copy link

github-actions bot commented May 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@XeonMations
Copy link
Contributor Author

What the fuck, why is the bot checking this? this is a DRAFT????

if(target in occupants)
return
if(pet_carrier_full(src)) //Run the checks again, just in case
to_chat(user, "<span class='warning'>[src] is already carrying too much!</span>")
return
if(target.mob_size >= MOB_SIZE_HUMAN) // If the mob is small or smaller, no need for a do_after.
if(!do_after(user, 3 SECONDS, target)) // If the mob is small or smaller, no need for a do_after.
Copy link
Member

Choose a reason for hiding this comment

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

you can merge two ifs together


/datum/species/diona/spec_death(gibbed, mob/living/carbon/human/H)
var/mob/living/simple_animal/hostile/retaliate/nymph/drone = drone_ref?.resolve()
if(drone)
Copy link
Member

Choose a reason for hiding this comment

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

this doesnt matter, just set it to null

Copy link
Member

@Archanial Archanial left a comment

Choose a reason for hiding this comment

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

most of the stuff has been addressed, sorry but github trolled me

adult.set_species(SPECIES_DIONA)

for(var/obj/item/bodypart/body_part in adult.bodyparts) //No limbs for you, small diona.
if(!istype(body_part, /obj/item/bodypart/chest) && !istype(body_part, /obj/item/bodypart/head)) // If its not a chest AND not a head
Copy link
Member

Choose a reason for hiding this comment

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

You could instead move the check for chest and head before this and with this you would be sure that this bodypart is not either

@@ -13,7 +13,7 @@
var/datum/sprite_accessory/stripe = GLOB.apid_stripes_list[stripe_name]

var/datum/universal_icon/icon_with_stripes = uni_icon('icons/mob/species/apid/bodyparts.dmi', "apid_chest_m", dir = SOUTH)
if (stripe.icon_state != "none")
if (stripe_name != FEATURE_NONE)
Copy link
Member

Choose a reason for hiding this comment

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

This is not the same

Copy link
Member

Choose a reason for hiding this comment

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

strings are case sensitive, it may break stuff

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Rukofamicom Rukofamicom dismissed Archanial’s stale review September 22, 2024 21:27

Seem to be addressed!

@Rukofamicom Rukofamicom added this pull request to the merge queue Sep 22, 2024
@Rukofamicom Rukofamicom added Golden ⭐ For high-effort PRs that make big and good improvements to the game. and removed Test Merged This PR is currently in rotation Testmerge Passed Seemed fine in testmerge Administration Tools labels Sep 22, 2024
Merged via the queue into BeeStation:master with commit 3f790e7 Sep 22, 2024
21 checks passed
@XeonMations XeonMations deleted the dionae branch October 8, 2024 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Config Update Feature Golden ⭐ For high-effort PRs that make big and good improvements to the game. Mapping DMM Change Sound Sprites SQL SQL Change Tweak
Projects
None yet
Development

Successfully merging this pull request may close these issues.