-
Notifications
You must be signed in to change notification settings - Fork 446
tweak: Реворк СЛР #6621
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
base: master220
Are you sure you want to change the base?
tweak: Реворк СЛР #6621
Conversation
*/ | ||
/mob/living/carbon/proc/pat_out(mob/living/target) | ||
if(target == src) // stop drop and roll, no trying to put out fire on yourself for free. | ||
to_chat(src, "<span class='warning'>Stop drop and roll!</span>") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
используй span_warning, заместо явного указания тега
H.receiving_cpr_from = null | ||
return | ||
|
||
visible_message(span_danger("[src] is trying to perform CPR on [H]'s lifeless body!"), span_danger("You start trying to perform CPR on [H]'s lifeless body!")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Если мы что-то меняем/добавляем, текст нужно переводить на русский. Исключение - багфиксы.
add_attack_logs(src, target, "activated an implanted grenade [G] in [target] with CPR.", ATKLOG_MOST) | ||
playsound(target.loc, 'sound/weapons/armbomb.ogg', 60, TRUE) | ||
G.active = TRUE | ||
addtimer(CALLBACK(G, TYPE_PROC_REF(/obj/item/grenade, prime)), G.det_time) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Сделай тут ранние ретурны. if(!условие) return .А со следующей строчки продолжаем то, что делается, если условие выполняется.
if(target.health >= HEALTH_THRESHOLD_CRIT && !HAS_TRAIT(target, TRAIT_FAKEDEATH)) | ||
if(target.on_fire) | ||
user.pat_out(target) | ||
else if(target.health >= HEALTH_THRESHOLD_CRIT && !HAS_TRAIT(target, TRAIT_FAKEDEATH) && target.stat != DEAD) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Тут тоже переделай на ранние ретурны
|
||
H.receiving_cpr_from = null | ||
visible_message(span_notice("[src] stops performing CPR on [H]."), span_notice("You stop performing CPR on [H].")) | ||
to_chat(src, span_danger("You need to stay still while performing CPR!")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Вообще прок do_cpr нужно резбить на несколько. Он слишком большой.
Описание
Порт вот этого ParadiseSS13/Paradise#21754 вот этого ParadiseSS13/Paradise#23257 и вот этого ParadiseSS13/Paradise#15563
Сердечно-лёгочная Реанимация теперь:
Так же повышен приоритет тушения напарника.
Локализация - локализаторам.
Причина создания ПР / Почему это хорошо для игры
https://discord.com/channels/617003227182792704/755125334097133628/1347830892051304449
Демонстрация изменений
Тесты
Тесты - тестерам.
Тосты - тостерам.