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.

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

Translate scanner gate detections #600

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Translate scanner gate detections #600

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e67464
Translate scanner gate detections
dj-34 Oct 20, 2024
42a8d18
Apply suggestions from code review
dj-34 Oct 22, 2024
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
16 changes: 8 additions & 8 deletions code/__DEFINES/diseases.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ DEFINE_BITFIELD(spread_flags, list(

//Severity Defines
/// Diseases that buff, heal, or at least do nothing at all
#define DISEASE_SEVERITY_POSITIVE "Positive"
#define DISEASE_SEVERITY_POSITIVE "Положительная"
/// Diseases that may have annoying effects, but nothing disruptive (sneezing)
#define DISEASE_SEVERITY_NONTHREAT "Harmless"
#define DISEASE_SEVERITY_NONTHREAT "Безопасная"
/// Diseases that can annoy in concrete ways (dizziness)
#define DISEASE_SEVERITY_MINOR "Minor"
#define DISEASE_SEVERITY_MINOR "Незначительная"
/// Diseases that can do minor harm, or severe annoyance (vomit)
#define DISEASE_SEVERITY_MEDIUM "Medium"
#define DISEASE_SEVERITY_MEDIUM "Средняя"
/// Diseases that can do significant harm, or severe disruption (brainrot)
#define DISEASE_SEVERITY_HARMFUL "Harmful"
#define DISEASE_SEVERITY_HARMFUL "Вредоносная"
/// Diseases that can kill or maim if left untreated (flesh eating, blindness)
#define DISEASE_SEVERITY_DANGEROUS "Dangerous"
#define DISEASE_SEVERITY_DANGEROUS "Опасная"
/// Diseases that can quickly kill an unprepared victim (fungal tb, gbs)
#define DISEASE_SEVERITY_BIOHAZARD "BIOHAZARD"
#define DISEASE_SEVERITY_BIOHAZARD "БИООПАСНОСТЬ"
/// Diseases that are uncurable (hms)
#define DISEASE_SEVERITY_UNCURABLE "Uncurable"
#define DISEASE_SEVERITY_UNCURABLE "Неизлечимая"

//Severity Guaranteed Cycles or how long before a disease can potentially self-cure
/// Positive diseases should not self-cure by themselves, but if they do, they cure fast
Expand Down
20 changes: 10 additions & 10 deletions code/game/machinery/scanner_gate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,20 +183,20 @@
return
if(SCANGATE_WANTED)
if(ishuman(thing))
detected_thing = "Warrant"
detected_thing = "Ордер на задержание"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
var/mob/living/carbon/human/scanned_human = thing
var/perpname = scanned_human.get_face_name(scanned_human.get_id_name())
var/datum/record/crew/target = find_record(perpname)
if(!target || (target.wanted_status == WANTED_ARREST))
beep = TRUE
if(SCANGATE_MINDSHIELD)
detected_thing = "Mindshield"
detected_thing = "Имплант защиты разума"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(ishuman(thing))
var/mob/living/carbon/human/scanned_human = thing
if(HAS_TRAIT(scanned_human, TRAIT_MINDSHIELD))
beep = TRUE
if(SCANGATE_DISEASE)
detected_thing = "[disease_threshold] infection"
detected_thing = "Инфекция уровня «[disease_threshold]»"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(iscarbon(thing))
var/mob/living/carbon/scanned_carbon = thing
if(get_disease_severity_value(scanned_carbon.check_virus()) >= get_disease_severity_value(disease_threshold))
Expand Down Expand Up @@ -236,11 +236,11 @@
if(is_species(scanned_human, scan_species))
beep = TRUE
if(detect_species == SCANGATE_ZOMBIE) //Can detect dormant zombies
detected_thing = "Romerol infection"
detected_thing = "Вирус Ромерола"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(scanned_human.get_organ_slot(ORGAN_SLOT_ZOMBIE))
beep = TRUE
if(SCANGATE_GUNS)
detected_thing = "Weapons"
detected_thing = "Оружие"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(isgun(thing))
beep = TRUE
else if(ishuman(thing))
Expand All @@ -251,7 +251,7 @@
if((!HAS_TRAIT(scanned_human, TRAIT_MINDSHIELD)) && (isnull(idcard) || !(ACCESS_WEAPONS in idcard.access))) // mindshield or ID card with weapons access, like bartender
beep = TRUE
break
say("[detected_thing] detection bypassed.")
say("Произведен пропуск сканирования на «[detected_thing]».")
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
break
else
for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
Expand All @@ -263,13 +263,13 @@
var/mob/living/carbon/human/scanned_human = thing
if(scanned_human.nutrition <= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_STARVING)
beep = TRUE
detected_thing = "Starvation"
detected_thing = "Голодание"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(scanned_human.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT)
beep = TRUE
detected_thing = "Obesity"
detected_thing = "Ожирение"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(SCANGATE_CONTRABAND)
for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
detected_thing = "Contraband"
detected_thing = "Контрабанда"
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
if(content.is_contraband())
beep = TRUE
break
Expand Down Expand Up @@ -304,7 +304,7 @@
return

if(detected_thing)
say("[detected_thing][reverse ? " not " : " "]detected!!")
say("[detected_thing][reverse ? " не " : " "]было обнаружено!")
larentoun marked this conversation as resolved.
Show resolved Hide resolved
dj-34 marked this conversation as resolved.
Show resolved Hide resolved

COOLDOWN_START(src, next_beep, 2 SECONDS)
playsound(source = src, soundin = 'sound/machines/scanner/scanbuzz.ogg', vol = 30, vary = FALSE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, falloff_distance = 4)
Expand Down
Loading