Skip to content

Фикс ушей админов. Снижение летальности кровотечений. #210

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.

Sign up for GitHub

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

Merged
SmiLeYre merged 1 commit into from
May 13, 2025
Merged

Фикс ушей админов. Снижение летальности кровотечений. #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions code/modules/mob/living/blood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
remove_status_effect(/datum/status_effect/debuff/bleeding)
apply_status_effect(/datum/status_effect/debuff/bleedingworst)
if(blood_volume <= BLOOD_VOLUME_BAD)
adjustOxyLoss(1)
adjustOxyLoss(0.4) // REDMOON EDIT - повышение выживаемости - WAS: 1
if(blood_volume <= BLOOD_VOLUME_SURVIVE)
adjustOxyLoss(2)
adjustOxyLoss(0.4) // REDMOON EDIT - повышение выживаемости - WAS: 2
else
remove_status_effect(/datum/status_effect/debuff/bleeding)
remove_status_effect(/datum/status_effect/debuff/bleedingworse)
Expand Down Expand Up @@ -169,12 +169,16 @@

//Makes a blood drop, leaking amt units of blood from the mob
/mob/living/proc/bleed(amt)
if(amt < 1.5) // Чтобы кровь не пачкала пол при маленьких и перевязанных ранах
return FALSE
if(HAS_TRAIT(src, TRAIT_NO_BLOOD))
return FALSE
if(!iscarbon(src) && !HAS_TRAIT(src, TRAIT_SIMPLE_WOUNDS))
return FALSE
if(blood_volume <= 0)
return FALSE
if(blood_volume < 100) // Давление крови слишком низкое. Повышаем выживаемость
return FALSE

blood_volume = max(blood_volume - amt, 0)
SSticker.blood_lost += amt
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/examine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,9 @@
if(bleed_rate)
var/bleed_wording = "bleeding"
switch(bleed_rate)
if(0 to 1)
if(1 to 2) // REDMOON EDIT - повышение выживаемости - WAS: 0 to 1
bleed_wording = "bleeding slightly"
if(1 to 5)
if(2 to 5) // REDMOON EDIT - повышение выживаемости - WAS: 1 to 5
bleed_wording = "bleeding"
if(5 to 10)
bleed_wording = "bleeding a lot"
Expand Down
19 changes: 13 additions & 6 deletions code/modules/mob/living/say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
var/Zs_yell = FALSE
var/listener_has_ceiling = TRUE
var/speaker_has_ceiling = TRUE
var/ignore_z_checks = FALSE

var/turf/speaker_turf = get_turf(src)
var/turf/speaker_ceiling = get_step_multiz(speaker_turf, UP)
Expand Down Expand Up @@ -323,12 +324,12 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// var/list/yellareas //CIT CHANGE - adds the ability for yelling to penetrate walls and echo throughout areas
for(var/_M in GLOB.player_list)
var/mob/M = _M
// if(M.stat != DEAD) //not dead, not important
if(M.stat != DEAD) //not dead, not important
// if(yellareas) //CIT CHANGE - see above. makes yelling penetrate walls
// var/area/A = get_area(M) //CIT CHANGE - ditto
// if(istype(A) && A.ambientsounds != SPACE && (A in yellareas)) //CIT CHANGE - ditto
// listening |= M //CIT CHANGE - ditto
// continue
continue
if(!client) //client is so that ghosts don't have to listen to mice
continue
if(!M)
Expand All @@ -341,8 +342,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
continue
if(!(M.client.prefs.chat_toggles & CHAT_GHOSTEARS)) //they're talking normally and we have hearing at any range off
continue
// REDMOON ADD START
if(isobserver(M) && (M.client.prefs.chat_toggles & CHAT_GHOSTEARS))
ignore_z_checks = TRUE
// REDMOON ADD END
if(!is_in_zweb(src.z, M.z))
continue
if(!ignore_z_checks) // REDMOON ADD
continue
listening |= M
the_dead[M] = TRUE

Expand Down Expand Up @@ -372,9 +378,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(istransparentturf(listener_ceiling))
listener_has_ceiling = FALSE
if((!Zs_too && !isobserver(AM)) || message_mode == MODE_WHISPER)
if(AM.z != src.z)
continue
if(Zs_too && AM.z != src.z && !Zs_all)
if(!ignore_z_checks)
if(AM.z != src.z)
continue
if(Zs_too && AM.z != src.z && !Zs_all && !ignore_z_checks)
if(!Zs_yell)
if(listener_turf.z < speaker_turf.z && listener_has_ceiling) //Listener is below the speaker and has a ceiling above them
continue
Expand Down