Skip to content

Commit

Permalink
[AFD] Improves certain death mechanics (ParadiseSS13#24923)
Browse files Browse the repository at this point in the history
* now

* :)

* sacrifice sacrifice

* lmao
  • Loading branch information
lewcc authored Mar 31, 2024
1 parent b3b08cc commit 8c90368
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 4 deletions.
5 changes: 5 additions & 0 deletions code/datums/keybindings/emote_keybinds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
linked_emote = /datum/emote/living/choke
name = "Choke"

// just putting this here so CI clears
/datum/keybinding/emote/carbon/fuck
linked_emote = /datum/emote/living/carbon/human/aaauuuggghhh
name = "lmao"

/datum/keybinding/emote/collapse
linked_emote = /datum/emote/living/collapse
name = "Collapse"
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/cult/runes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ structure_check() searches for nearby cultist structures required for the invoca
to_chat(M, "<span class='cultlarge'>\"I accept this sacrifice.\"</span>")
else
to_chat(M, "<span class='cultlarge'>\"I accept this meager sacrifice.\"</span>")
playsound(offering, 'sound/misc/demon_consume.ogg', 100, TRUE, SOUND_RANGE_SET(10))
playsound(offering, 'sound/effects/cultsacrifice.ogg', 100, TRUE, SOUND_RANGE_SET(10))

if(((ishuman(offering) || isrobot(offering) || isbrain(offering)) && offering.mind) && !worthless)
var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src))
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,7 @@
if(!(user.has_organ(zone))) // If they somehow don't have a head.
zone = "chest"
playsound(src, 'sound/weapons/gunshots/gunshot_strong.ogg', 50, 1)
playsound(src, 'sound/voice/now.ogg', 80, TRUE)
user.visible_message("<span class='danger'>[src] goes off!</span>")
post_shot(user)
user.apply_damage(300, BRUTE, zone, sharp = TRUE, used_weapon = "Self-inflicted gunshot wound to the [zone].")
Expand Down
9 changes: 6 additions & 3 deletions code/game/turfs/simulated/floor/chasm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,15 @@
falling_atoms[AM] = TRUE
var/turf/T = locate(drop_x, drop_y, drop_z)
if(T)
AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>GAH! Ah... where are you?</span>")
T.visible_message("<span class='boldwarning'>[AM] falls from above!</span>")
AM.forceMove(T)
if(isliving(AM))
var/mob/living/L = AM
L.emote("aaauuuggghhh", intentional = FALSE)
L.Weaken(10 SECONDS)
L.adjustBruteLoss(30)
AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>GAH! Ah... where are you?</span>")
T.visible_message("<span class='boldwarning'>[AM] falls from above!</span>")
AM.forceMove(T)

falling_atoms -= AM

/turf/simulated/floor/chasm/straight_down
Expand Down Expand Up @@ -197,6 +199,7 @@
var/mob/living/L = AM
L.notransform = TRUE
L.Weaken(20 SECONDS)
L.emote("aaauuuggghhh", intentional = FALSE)
var/oldtransform = AM.transform
var/oldcolor = AM.color
var/oldalpha = AM.alpha
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/human_death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@
if(!IS_HORIZONTAL(src))
// keep us upright so the animation fits.
ADD_TRAIT(src, TRAIT_FORCED_STANDING, TRAIT_GENERIC)
emote("aaauuuggghhh", intentional = FALSE)
if(!death(TRUE) && stat != DEAD)
return FALSE
notransform = TRUE

dust_animation()

QDEL_IN(src, 2 SECONDS)
return TRUE

Expand Down
16 changes: 16 additions & 0 deletions code/modules/mob/living/carbon/human/human_emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,22 @@
mob_type_allowed_typecache = list(/mob/living/carbon/human)
hands_use_check = TRUE

/datum/emote/living/carbon/human/aaauuuggghhh
key = "aaauuuggghhh"
message = "screams in agony!"
message_mime = "raises their hands and makes an agonized expression!"
emote_type = EMOTE_AUDIBLE
sound = 'sound/voice/dust.ogg'
vary = TRUE

/datum/emote/living/carbon/human/play_sound_effect(mob/living/carbon/human/user, intentional, sound_path, sound_volume)
if(intentional)
// get trolled idiot
user.visible_message("<span class='danger'>[user] starts having a seizure!</span>", "<span class='alert'>You have a seizure!</span>")
user.Paralyse(20 SECONDS)
user.Jitter(2000 SECONDS)
else
return ..()

/////////
// Species-specific emotes
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@

target.visible_message("<span class='warning'>[user] pulls the trigger!</span>", "<span class='userdanger'>[user] pulls the trigger!</span>")

if(user == target)
playsound(src, 'sound/voice/now.ogg', 80, TRUE)

if(chambered && chambered.BB)
chambered.BB.damage *= 5

Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/projectile/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@

/obj/item/gun/projectile/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
user.apply_damage(300, BRUTE, affecting)
playsound(src, 'sound/voice/now.ogg', 100, TRUE)
user.visible_message("<span class='danger'>[user.name] fires [src] at [user.p_their()] head!</span>", "<span class='userdanger'>You fire [src] at your head!</span>", "<span class='italics'>You hear a gunshot!</span>")

/obj/item/gun/projectile/revolver/russian/soul
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/projectile_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
sleep(25)
if(user.l_hand == src || user.r_hand == src)
process_fire(user, user, 0, zone_override = "head")
playsound(src, 'sound/voice/now.ogg', 80, TRUE)
user.visible_message("<span class='suicide'>[user] blows [user.p_their()] brains out with [src]!</span>")
return BRUTELOSS
else
Expand Down
Binary file added sound/effects/cultsacrifice.ogg
Binary file not shown.
Binary file added sound/voice/dust.ogg
Binary file not shown.
Binary file added sound/voice/now.ogg
Binary file not shown.

0 comments on commit 8c90368

Please sign in to comment.