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

Death is Our Destination (New funeral rite) #8346

Merged
merged 21 commits into from
Nov 10, 2023

Conversation

Mycah142
Copy link
Contributor

@Mycah142 Mycah142 commented Oct 31, 2023

About The Pull Request

Since I was on this weird death kick, someone mentioned Iriska never fit into a coffin. Well, that's a crying shame! So I made this wide boy
84dv5y
And while I was at THAT, I decided to make coffins burnable, and have that be a funeral rite. It's more effective than the morgue, requiring a bit more effort than drag body to tray, click. I made coffins a bit less closet-like as well, requiring tools to open or close, requiring a bit of time to do so; they also only accept mobs now, so make sure Jimmy has his brain in before you torch 'im. Y'know, for flavor.

Why It's Good For The Game

Captain COOOOOOOOOOOOPIUM can now hold a midnight vigil for the cat his FO purposefully shot trying to steal the Destiny.

Testing

Changes to the coffin were pretty high, and testing it local was difficult, so I used a video instead.
dreamseeker_KcdFSlAx8L.webm
(I don't know why it just refuses to embed)

Changelog

🆑
add: Pauper's Coffin, a larger coffin.
add: Funeral Pyre capabilities, burning coffins.
tweak: Coffins now require tools to open/close. Can still be walked out of.
tweak: Coffins now only accept mobs.
imageadd: added the worst flame.gif I could summon.
/:cl:

The Biomatter Reactor was intended to give a 15 minute bonus to the respawn timer, but never worked. I fixed this.
Added new coffin, the Pauper's coffin. Fits two Iriskas worth of bodies.
Added lazy fire overlay because I am no artist.
Added Funeral Pyre functionality to coffins.
Tweaked how coffins are opened/closed, using tools so they're not just weird closets.
@thevandie
Copy link
Contributor

can you also fix the thing where the funeral things ONLY apply when your player ghost is in the body/brain?

@Mycah142
Copy link
Contributor Author

can you also fix the thing where the funeral things ONLY apply when your player ghost is in the body/brain?

Watch the video. I'm clearly not in the body/brain.

@thevandie
Copy link
Contributor

didn't know there was a video, your recording system is archaic and didn't embed
mah bad

@SirRichardFrancis
Copy link
Member

didn't embed mah

279232849-e177e6c7-5c72-4c47-be64-29e870453ffa.webm

@Mycah142
Copy link
Contributor Author

Currently, the Morgue looks for a mob. If the Mob lacks a brain, then it no longer has an associated Ckey, as removing the brain moves the Ckey to the brain.

So if medical personnel morgue the body, but have the brain in the bag with them, it also doesn't work, as it specifically looks for a mob, and brains are not mobs.

@SirRichardFrancis
Copy link
Member

Fire animation is really janky. Consider at least making it slower, that should help somewhat.

@Mycah142
Copy link
Contributor Author

Mycah142 commented Oct 31, 2023

Fire animation is really janky.

wait til you see my code

Copy link
Member

@SirRichardFrancis SirRichardFrancis left a comment

Choose a reason for hiding this comment

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

wait til you see my code

comehere

@thevandie
Copy link
Contributor

thevandie commented Oct 31, 2023

btw, the pauper coffin doesn't have an open door sprite from what I can see, probably should

image

even if it's the incorrect size, there should still be something there
(if you specifically didn't add it cause size constraints, idk maybe just have a tiny chunk of it, like it's propped up the side

@Mycah142
Copy link
Contributor Author

I am aware it lacks a door. There's two pixels of height where the door should be. The coffin stays chonk. Door be damned.

@thevandie
Copy link
Contributor

thevandie commented Oct 31, 2023

image

would this not work?
or is my mockup too short for your liking?

@SirRichardFrancis
Copy link
Member

You can add a door as an overlay, just offset it lol.

@Mycah142
Copy link
Contributor Author

It's settled I'll make the door a new object you gotta pull off.

@SirRichardFrancis
Copy link
Member

No no no, don't have to be a separate object. Just slap a second sprite on top.

@thevandie
Copy link
Contributor

thevandie commented Oct 31, 2023

image

but yeah, this is literally all you'd need, just a shaved version of the normal one, to make it look like it's slumped over the back.
like this random stock image

image

unlike the normal one, which is folding instead of a separate piece of material

Copy link
Contributor

@Firefox13 Firefox13 left a comment

Choose a reason for hiding this comment

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

Atomize your PRs. Fixes in one, new features in the other.

Copy link
Contributor

@Firefox13 Firefox13 left a comment

Choose a reason for hiding this comment

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

Can you resist out of a closed coffin? Is there any way to acquire puper's coffin? Are you sure people aren't going to misuse the its humongous storage capacity?

@Mycah142
Copy link
Contributor Author

Can you resist out of a closed coffin?

Currently, without tools, no. Is there a way to resist out of a welded closet?

Is there any way to acquire puper's coffin?

You right I forgot to make the crafting recipe.

Are you sure people aren't going to misuse the its humongous storage capacity?

I can make it bodies only easy.

@Mycah142
Copy link
Contributor Author

Can you resist out of a closed coffin?

Currently, without tools, no. Is there a way to resist out of a welded closet?

I could make it only work if the occupant is dead.

@Firefox13
Copy link
Contributor

Currently, without tools, no. Is there a way to resist out of a welded closet?

изображение

Even if this code doesn't work you shouldn't be able to permalock people like this.

@thevandie
Copy link
Contributor

I do believe you can break out of welded closets, yeah
Takes 5 minutes and it's reset when the locker is moved, but it does work

Btw, like I said I can't access the discord currently, but if you're cuffed and you rest, you're physically unable to get up. It cancels the loading bar every time.

Added to recipe list.
@Mycah142 Mycah142 changed the title Death is Our Destination (Respawn bonus fixes, new funeral rite) Death is Our Destination (New funeral rite) Oct 31, 2023
@Mycah142
Copy link
Contributor Author

Mycah142 commented Nov 1, 2023

Can you resist out of a closed coffin?

Hey fun fact. One can just fucking walk and the coffin opens, like a closet. I completely fucking spaced it on giving it a welded status, so anyone trapped inside can easily escape it if they're conscious. I assume this is acceptable.

@Mycah142 Mycah142 closed this Nov 1, 2023
@Mycah142 Mycah142 reopened this Nov 1, 2023
@Mycah142
Copy link
Contributor Author

Mycah142 commented Nov 1, 2023

I did not mean to fukken close this PR I fatfingered so fucking hard I am angy

Added open door sprite
Tweaked coffins to only fit mobs
Turned Pyre proc into two to accomodate proper timer
spelling mistakes yay
I am tired.
@Mycah142 Mycah142 requested a review from Firefox13 November 1, 2023 01:10
Coffin is extinguished when opened. Can be opened by occupant on walking, or via tools as normal.

Also closed casket is possible, as the coffin will close during pyre proc.
@Mycah142
Copy link
Contributor Author

Mycah142 commented Nov 3, 2023

Alright. This is 99% the finished product. I tried to make the pyre flame gif better (I am barely a coder, nevermind an artist), I improved the messages, and I even made sure that anyone trapped in it can escape as easily as an unlocked closet so it isn't just easy round removal. Opening it causes the flames to go out as well.

The only thing missing is making a fire extinguisher work with it, but that is better tackled as a completely different PR where I add reagent interactions to structures (which currently doesn't exist, it's just snowflake code on shit like Thermite) so that the fire can be extinguished via, well, an extinguisher.

@hyperioo hyperioo merged commit 77f895e into discordia-space:master Nov 10, 2023
6 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.

5 participants