cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-13 11:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes quiet succumb as it actually works now (#88060)

Browse Source 
## About The Pull Request

removes RMB quiet succumb as it actually works now


https://github.com/user-attachments/assets/d59351e5-3d1c-4743-95d9-99b52629e133


## Why It's Good For The Game

the trimtext bug was patched out both in our code and additionally byond
515.1647

## Changelog
🆑
del: removed quiet succumb which is pointless now that the bug got fixed
/🆑
This commit is contained in:
jimmyl
2024-11-21 23:29:59 +01:00
committed by GitHub
parent e7a7a74952
commit b10a9d26fc
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/_onclick/hud/alert.dm
View File

@@ -498,19 +498,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
"All Good Things Must End" "All Good Things Must End"
) )
/atom/movable/screen/alert/succumb/Initialize(mapload, datum/hud/hud_owner)
. = ..()
register_context()
/atom/movable/screen/alert/succumb/add_context(atom/source, list/context, obj/item/held_item, mob/user)
context[SCREENTIP_CONTEXT_LMB] = "Succumb With Last Words"
context[SCREENTIP_CONTEXT_RMB] = "Succumb Silently"
return CONTEXTUAL_SCREENTIP_SET
#define FASTSUCCUMB_YES "Yes"
#define FASTSUCCUMB_WAIT "Wait, I have last words!"
#define FASTSUCCUMB_NO "No"
/atom/movable/screen/alert/succumb/Click(location, control, params) /atom/movable/screen/alert/succumb/Click(location, control, params)
. = ..() . = ..()
if(!.) if(!.)
@@ -521,17 +508,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
var/title = pick(death_titles) var/title = pick(death_titles)
if(LAZYACCESS(params2list(params), RIGHT_CLICK))
//Succumbing without a message
var/choice = tgui_alert(living_owner, "Are you sure you want to succumb?", title, list(FASTSUCCUMB_YES, FASTSUCCUMB_WAIT, FASTSUCCUMB_NO))
switch(choice)
if(FASTSUCCUMB_NO, null)
return
if(FASTSUCCUMB_YES)
living_owner.succumb()
return
//if(FASTSUCCUMB_WAIT), we continue to last words
//Succumbing with a message //Succumbing with a message
var/last_whisper = tgui_input_text(usr, "Do you have any last words?", title, max_length = CHAT_MESSAGE_MAX_LENGTH, encode = FALSE) // saycode already handles sanitization var/last_whisper = tgui_input_text(usr, "Do you have any last words?", title, max_length = CHAT_MESSAGE_MAX_LENGTH, encode = FALSE) // saycode already handles sanitization
if(isnull(last_whisper)) if(isnull(last_whisper))
@@ -540,9 +516,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
living_owner.say("#[last_whisper]") living_owner.say("#[last_whisper]")
living_owner.succumb(whispered = length(last_whisper) > 0) living_owner.succumb(whispered = length(last_whisper) > 0)
#undef FASTSUCCUMB_NO
#undef FASTSUCCUMB_WAIT
#undef FASTSUCCUMB_YES
//ALIENS //ALIENS
/atom/movable/screen/alert/alien_plas /atom/movable/screen/alert/alien_plas

2
code/modules/mob/living/living.dm
View File

@@ -534,7 +534,7 @@
if (!CAN_SUCCUMB(src)) if (!CAN_SUCCUMB(src))
if(HAS_TRAIT(src, TRAIT_SUCCUMB_OVERRIDE)) if(HAS_TRAIT(src, TRAIT_SUCCUMB_OVERRIDE))
if(whispered) if(whispered)
to_chat(src, span_notice("Your immortal body is keeping you alive. If you want to accept death, you must do so [span_bold("quietly")]."), type=MESSAGE_TYPE_INFO) to_chat(src, span_notice("Your immortal body is keeping you alive! Unless you just press the UI button."), type=MESSAGE_TYPE_INFO)
return return
else else
to_chat(src, span_warning("You are unable to succumb to death! This life continues."), type=MESSAGE_TYPE_INFO) to_chat(src, span_warning("You are unable to succumb to death! This life continues."), type=MESSAGE_TYPE_INFO)