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
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 82 additions & 1 deletion code/game/objects/structures/crates_lockers/closets/coffin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
spawn_tags = SPAWN_TAG_CLOSET_COFFIN
bad_type = /obj/structure/closet/coffin
var/mob/living/occupant = null
var/on_fire = 0
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved

/obj/structure/closet/coffin/pauper
name = "pauper's coffin"
desc = "A burial receptacle for the dearly departed. Perfect for the entire family."
icon_state = "coffin_wide"
matter = list(MATERIAL_WOOD = 30)
storage_capacity = 2 * MOB_HUGE //*slaps coffin* This bad boy fits two whole Iriskas

/obj/structure/closet/coffin/close(mob/living/user)
..()
Expand All @@ -32,6 +40,7 @@
M.set_respawn_bonus("CORPSE_HANDLING", COFFIN_RESPAWN_BONUS)

qdel(occupant)
qdel(contents)
qdel(src)

return TRUE
Expand All @@ -51,4 +60,76 @@
var/atom/A = pick(/obj/landmark/corpse/chef, /obj/landmark/corpse/doctor, /obj/landmark/corpse/engineer, /obj/landmark/corpse/engineer/rig, /obj/landmark/corpse/clown, \
/obj/landmark/corpse/scientist, /obj/landmark/corpse/miner, /obj/landmark/corpse/miner/rig, /obj/landmark/corpse/bridgeofficer, /obj/landmark/corpse/commander, \
/obj/landmark/corpse/russian)
new A
new A

/obj/structure/closet/coffin/attack_hand(mob/user as mob)
src.add_fingerprint(user)
if(opened)
to_chat(user, SPAN_NOTICE("You can't fit the cover back on without hammering it into place!"))
if(!opened)
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
to_chat(user, SPAN_NOTICE("The cover is too heavy to lift without a prying tool!"))

/obj/structure/closet/coffin/proc/pyre(atom/movable/object)
add_overlay("coffin_pyre")
on_fire = 1
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
anchored = 1
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
sleep(600) //One minute to burn, for theatrics
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
new /obj/effect/decal/cleanable/ash(src.loc)
if(occupant)
lost_in_space()

/obj/structure/closet/coffin/attackby(obj/item/I, mob/user)
if(on_fire)
to_chat(user, SPAN_NOTICE("The pyre is already lit. There's no turning back."))
return
if(!on_fire && isflamesource(I))
user.visible_message(SPAN_WARNING("[user] has lit the [src] on fire!"))
pyre()

var/list/usable_qualities = list()
if(opened)
usable_qualities += QUALITY_SAWING
usable_qualities += QUALITY_PRYING
usable_qualities += QUALITY_HAMMERING
if(!opened)
usable_qualities += QUALITY_PRYING

var/tool_type = I.get_tool_type(user, usable_qualities, src)
switch(tool_type)
if(QUALITY_PRYING)
if(!opened)
if(I.use_tool(user, src, WORKTIME_FAST, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC))
visible_message(
SPAN_NOTICE("\The [src] has been pried open by [user] with \the [I]."),
"You hear [tool_type]."
)
open()
else
if(I.use_tool(user, src, WORKTIME_FAST, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC))
visible_message(
SPAN_NOTICE("\The [src] has been pried apart by [user] with \the [I]."),
"You hear [tool_type]."
)
drop_materials(drop_location())
qdel(src)
return

if(QUALITY_SAWING)
if(opened)
if(I.use_tool(user, src, WORKTIME_FAST, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC))
visible_message(
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
SPAN_NOTICE("\The [src] has been cut apart by [user] with \the [I]."),
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
"You hear [tool_type]."
)
drop_materials(drop_location())
qdel(src)
return
if(QUALITY_HAMMERING)
if(opened)
if(I.use_tool(user, src, WORKTIME_FAST, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC))
visible_message(
Mycah142 marked this conversation as resolved.
Show resolved Hide resolved
SPAN_NOTICE("\The [src] has had it's cover secured by [user] with \the [I]."),
"You hear [tool_type]."
)
close()
return
6 changes: 4 additions & 2 deletions code/modules/biomatter_manipulation/bioreactor/platform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,10 @@
organ.forceMove(get_turf(neighbor_platform))
organ.removed()
continue
if(H && H.mind && H.mind.key && H.stat == DEAD)
var/mob/M = key2mob(H.mind.key)
if(istype(object, /obj/item/organ/internal/vital/brain))
var/obj/item/organ/internal/vital/brain/B = object
if(B.brainmob && B.brainmob.mind && B.brainmob.mind.key)
var/mob/M = key2mob(B.brainmob.mind.key)
to_chat(M, SPAN_NOTICE("Your remains have been dissolved and reused. Your crew respawn time is reduced by [(BIOREACTOR_RESPAWN_BONUS)/600] minutes."))
M << 'sound/effects/magic/blind.ogg' //Play this sound to a player whenever their respawn time gets reduced
M.set_respawn_bonus("CORPSE_DISSOLVING", BIOREACTOR_RESPAWN_BONUS)
Expand Down
Binary file modified icons/obj/closet.dmi
Binary file not shown.
Loading