Injection Level: "
+ dat += "Объём инъекции: "
dat += "- "
dat += "[injection_amount] "
dat += "+ "
dat += "
"
- dat += "Reagent Source: "
- dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
"
+ dat += "Источник реагентов: "
+ dat += "[use_beaker ? "Установленная ёмкость (Если доступна)" : "Внутренний синтезатор"]
"
- dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
"
- dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
"
- dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
"
- dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
"
- dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
"
+ dat += "Лечить вирусные инфекции: [treat_virus ? "Да" : "Нет"]
"
+ dat += "Динамик [shut_up ? "выключен" : "включён"]. Переключить
"
+ dat += "Оповещать о тяжелораненых: [declare_crit ? "Да" : "Нет"]
"
+ dat += "Режим патрулирования: [auto_patrol ? "Да" : "Нет"]
"
+ dat += "Стационарный режим: [stationary_mode ? "Да" : "Нет"]
"
return dat
@@ -241,8 +264,12 @@
use_beaker = !use_beaker
else if(href_list["eject"] && (!isnull(reagent_glass)))
- reagent_glass.forceMove(get_turf(src))
+ if(ishuman(usr))
+ usr.put_in_active_hand(reagent_glass, ignore_anim = FALSE)
+ else
+ reagent_glass.forceMove(get_turf(src))
reagent_glass = null
+ balloon_alert(usr, "ёмкость извлечена")
else if(href_list["togglevoice"])
shut_up = !shut_up
@@ -274,15 +301,15 @@
if(istype(I, /obj/item/reagent_containers/glass))
add_fingerprint(user)
if(locked)
- to_chat(user, span_warning("You cannot insert a beaker because the panel is locked!"))
+ balloon_alert(user, "техпанель заблокирована!")
return ATTACK_CHAIN_PROCEED|ATTACK_CHAIN_NO_AFTERATTACK
if(reagent_glass)
- to_chat(user, span_warning("There is already a beaker loaded!"))
+ balloon_alert(user, "слот для ёмкости занят!")
return ATTACK_CHAIN_PROCEED|ATTACK_CHAIN_NO_AFTERATTACK
if(!user.drop_transfer_item_to_loc(I, src))
return ..() | ATTACK_CHAIN_NO_AFTERATTACK
reagent_glass = I
- to_chat(user, span_notice("You insert [I]."))
+ balloon_alert(user, "ёмкость установлена")
show_controls(user)
return ATTACK_CHAIN_PROCEED_SUCCESS|ATTACK_CHAIN_NO_AFTERATTACK
@@ -298,8 +325,8 @@
if(emagged == 2)
declare_crit = FALSE
if(user)
- to_chat(user, span_notice("You short out [src]'s reagent synthesis circuits."))
- audible_message(span_danger("[src] buzzes oddly!"))
+ to_chat(user, span_notice("Вы замыкаете микросхемы синтеза реагентов [declent_ru(GENITIVE)]."))
+ audible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] странно жужжит."))
flick("medibot_spark", src)
if(user)
oldpatient = user
@@ -308,7 +335,7 @@
/mob/living/simple_animal/bot/medbot/process_scan(mob/living/carbon/human/H)
if(buckled)
if((last_warning + 30 SECONDS) < world.time)
- speak(span_danger("Movement restrained! Unit on standby!"))
+ speak(span_danger("Движение невозможно! Режим ожидания."))
playsound(loc, 'sound/machines/buzz-two.ogg', 50, FALSE)
last_warning = world.time
return
@@ -316,14 +343,15 @@
return
if((H == oldpatient) && (world.time < last_found + 20 SECONDS))
+
return
if(assess_patient(H))
last_found = world.time
if((last_newpatient_speak + 30 SECONDS) < world.time) //Don't spam these messages!
- var/list/messagevoice = list("Hey, [H.name]! Hold on, I'm coming." = 'sound/voice/mcoming.ogg',
- "Wait [H.name]! I want to help!" = 'sound/voice/mhelp.ogg',
- "[H.name], you appear to be injured!" = 'sound/voice/minjured.ogg')
+ var/list/messagevoice = list("Эй, [H.name]! Держись, я уже иду!" = 'sound/voice/mcoming.ogg',
+ "Подожди, [H.name]! Я спешу на помощь!" = 'sound/voice/mhelp.ogg',
+ "[H.name], кажется, вы ранены!" = 'sound/voice/minjured.ogg')
var/message = pick(messagevoice)
speak(message)
playsound(loc, messagevoice[message], 50, FALSE)
@@ -344,11 +372,11 @@
if(!patient)
if(!shut_up && prob(1))
- var/list/messagevoice = list("Radar, put a mask on!" = 'sound/voice/mradar.ogg',
- "There's always a catch, and I'm the best there is." = 'sound/voice/mcatch.ogg',
- "I knew it, I should've been a plastic surgeon." = 'sound/voice/msurgeon.ogg',
- "What kind of medbay is this? Everyone's dropping like flies." = 'sound/voice/mflies.ogg',
- "Delicious!" = 'sound/voice/mdelicious.ogg')
+ var/list/messagevoice = list("Ты, надень свою маску!" = 'sound/voice/mradar.ogg',
+ "Что-то всегда идёт не так, но я справлюсь." = 'sound/voice/mcatch.ogg',
+ "А ведь я мог бы стать пластическим хирургом..." = 'sound/voice/msurgeon.ogg',
+ "Что это за медотсек? Все мрут, словно мухи." = 'sound/voice/mflies.ogg',
+ "Замечательно!")
var/message = pick(messagevoice)
speak(message)
playsound(loc, messagevoice[message], 50, FALSE)
@@ -501,9 +529,9 @@
return
if(C.stat == DEAD || HAS_TRAIT(C, TRAIT_FAKEDEATH))
- var/list/messagevoice = list("No! Stay with me!" = 'sound/voice/mno.ogg',
- "Live, damnit! LIVE!" = 'sound/voice/mlive.ogg',
- "I...I've never lost a patient before. Not today, I mean." = 'sound/voice/mlost.ogg')
+ var/list/messagevoice = list("Нет, не оставляй меня!" = 'sound/voice/mno.ogg',
+ "Живи, чёрт возьми! ЖИВИ!" = 'sound/voice/mlive.ogg',
+ "Я... Я ещё не терял пациента. Не сегодня, имею ввиду." = 'sound/voice/mlost.ogg')
var/message = pick(messagevoice)
speak(message)
playsound(loc, messagevoice[message], 50, FALSE)
@@ -521,9 +549,9 @@
reagent_id = select_medication(C, beaker_injection)
if(!reagent_id) //If they don't need any of that they're probably cured!
- var/list/messagevoice = list("All patched up!" = 'sound/voice/mpatchedup.ogg',
- "An apple a day keeps me away." = 'sound/voice/mapple.ogg',
- "Feel better soon!" = 'sound/voice/mfeelbetter.ogg')
+ var/list/messagevoice = list("Как новенький!" = 'sound/voice/mpatchedup.ogg',
+ "Кто яблоко в день съедает, у того [declent_ru(NOMINATIVE)] не бывает!" = 'sound/voice/mapple.ogg',
+ "Скоро полегчает!" = 'sound/voice/mfeelbetter.ogg')
var/message = pick(messagevoice)
speak(message)
playsound(loc, messagevoice[message], 50, FALSE)
@@ -533,8 +561,8 @@
if(!emagged && !hijacked && check_overdose(patient, reagent_id, injection_amount))
soft_reset()
return
- C.visible_message(span_danger("[src] is trying to inject [patient]!"),
- span_userdanger("[src] is trying to inject you!"))
+ C.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] пытается сделать укол [patient]!"),
+ span_userdanger("[capitalize(declent_ru(NOMINATIVE))] пытается сделать вам укол!"))
addtimer(CALLBACK(src, PROC_REF(do_inject), C, !isnull(beaker_injection), reagent_id), 3 SECONDS)
@@ -551,10 +579,10 @@
else
patient.reagents.add_reagent(reagent_id, injection_amount)
- C.visible_message(span_danger("[src] injects [patient] with its syringe!"),
- span_userdanger("[src] injects you with its syringe!"))
+ C.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] сделал укол [patient] своим шприцем!"),
+ span_userdanger("[capitalize(declent_ru(NOMINATIVE))] сделал вам укол своим шприцем!"))
else
- visible_message("[src] retracts its syringe.")
+ visible_message("[capitalize(declent_ru(NOMINATIVE))] убирает свой шприц.")
update_icon()
soft_reset()
@@ -572,7 +600,7 @@
/mob/living/simple_animal/bot/medbot/explode()
on = FALSE
- visible_message(span_userdanger("[src] blows apart!"))
+ visible_message(span_userdanger("[capitalize(declent_ru(NOMINATIVE))] разлетается на части!"))
var/turf/Tsec = get_turf(src)
if(drops_parts)
@@ -623,7 +651,7 @@
if(syndicate_aligned)
return
var/area/location = get_area(src)
- speak("Medical emergency! [crit_patient ? "[crit_patient]" : "A patient"] is in critical condition at [location]!", radio_channel)
+ speak("Нужна срочная медицинская помощь! [crit_patient ? "[crit_patient]" : "Пациент"] в тяжёлом состоянии в локации [location]!", radio_channel)
declare_cooldown = TRUE
spawn(200) //Twenty seconds
declare_cooldown = FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 28ca08789e5..61659f90974 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -8,7 +8,15 @@
/mob/living/simple_animal/bot/mulebot
name = "\improper MULEbot"
- desc = "A Multiple Utility Load Effector bot."
+ desc = "Многофункциональный Узкоспециализированный Легкомоторный робот. Нет, это не просто случайные слова, подобранные для красивого написания. Честно."
+ ru_names = list(
+ NOMINATIVE = "МУЛбот",
+ GENITIVE = "МУЛбота",
+ DATIVE = "МУЛботу",
+ ACCUSATIVE = "МУЛбота",
+ INSTRUMENTAL = "МУЛботом",
+ PREPOSITIONAL = "МУЛботе",
+ )
icon_state = "mulebot0"
density = TRUE
move_resist = MOVE_FORCE_STRONG
@@ -26,7 +34,7 @@
bot_type = MULE_BOT
bot_filter = RADIO_MULEBOT
model = "MULE"
- bot_purpose = "deliver crates and other packages between departments, as requested"
+ bot_purpose = "доставлять ящики и другие посылки получателям"
bot_core_type = /obj/machinery/bot_core/mulebot
path_image_color = "#7F5200"
@@ -108,26 +116,24 @@
. = ..()
if(!ATTACK_CHAIN_CANCEL_CHECK(.) && knock_off(1 + I.force * 2))
user.visible_message(
- span_danger("[user] has knocked [cached_load] off [src]!"),
- span_danger("You have knocked [cached_load] off [src]!"),
+ span_danger("[user] столкнул [cached_load] с [declent_ru(GENITIVE)]!"),
+ span_danger("Вы столкнули [cached_load] с [declent_ru(GENITIVE)]!"),
)
return .
if(istype(I,/obj/item/stock_parts/cell))
add_fingerprint(user)
if(!open)
- to_chat(user, span_warning("You should open the maintenance panel first."))
+ balloon_alert(user, "техпанель закрыта!")
return ATTACK_CHAIN_PROCEED
if(cell)
- to_chat(user, span_warning("The [name] already has a power cell installed."))
+ balloon_alert(user, "слот батареи занят!")
return ATTACK_CHAIN_PROCEED
if(!user.drop_transfer_item_to_loc(I, src))
return ..()
cell = I
- user.visible_message(
- span_notice("[user] has inserted a cell into [src]."),
- span_notice("You have inserted the new cell into [src]."),
- )
+ visible_message(span_notice("[user] вставил батарею в [declent_ru(GENITIVE)]."))
+ balloon_alert(user, "вы вставили батарею внутрь")
update_controls()
return ATTACK_CHAIN_BLOCKED_ALL
@@ -135,8 +141,8 @@
. = ..()
if(!ATTACK_CHAIN_CANCEL_CHECK(.) && knock_off(1 + I.force * 2))
user.visible_message(
- span_danger("[user] has knocked off [cached_load] from [src]!"),
- span_danger("You have knocked off [cached_load] from [src]!"),
+ span_danger("[user] столкнул [cached_load] с [declent_ru(GENITIVE)]!"),
+ span_danger("Вы столкнули [cached_load] с [declent_ru(GENITIVE)]!"),
)
@@ -163,37 +169,31 @@
. = TRUE
if(health >= maxHealth)
add_fingerprint(user)
- to_chat(user, span_warning("[src] does not need a repair!"))
+ balloon_alert(user, "ремонт не требуется")
return .
user.visible_message(
- span_notice("[user] starts to repair [src]."),
- span_notice("You start to repair [src]..."),
+ span_notice("[user] ремонтиру[pluralize_ru(user.gender, "ет", "ют")] [declent_ru(GENITIVE)]."),
+ span_notice("Вы ремонтируете [declent_ru(GENITIVE)].")
)
if(!I.use_tool(src, user, 2 SECONDS, volume = I.tool_volume) || health >= maxHealth)
return .
heal_damage_type(25, BRUTE)
- user.visible_message(
- span_notice("[user] has repaired [src]."),
- span_notice("You have repaired [src]."),
- )
/mob/living/simple_animal/bot/mulebot/crowbar_act(mob/living/user, obj/item/I)
. = TRUE
if(!open)
add_fingerprint(user)
- to_chat(user, span_warning("You should open the maintenance panel first."))
+ balloon_alert(user, "техпанель закрыта!")
return .
if(!cell)
add_fingerprint(user)
- to_chat(user, span_warning("The [name] has no power cell installed."))
+ balloon_alert(user, "слот для батареи пуст!")
return .
if(!I.use_tool(src, user, volume = I.tool_volume))
return .
- user.visible_message(
- span_notice("[user] has removed the power cell from [src]."),
- span_notice("You have removed the power cell from [src]."),
- )
+ visible_message(span_notice("[user] вынул батарею из [declent_ru(GENITIVE)]."))
+ balloon_alert(user, "батарея извлечена")
cell.add_fingerprint(user)
cell.forceMove(drop_location())
cell = null
@@ -203,7 +203,7 @@
. = TRUE
if(!open)
add_fingerprint(user)
- to_chat(user, span_warning("You should open the maintenance panel first."))
+ balloon_alert(user, "техпанель закрыта!")
return .
if(!I.use_tool(src, user, volume = I.tool_volume))
return .
@@ -214,7 +214,7 @@
. = TRUE
if(!open)
add_fingerprint(user)
- to_chat(user, span_warning("You should open the maintenance panel first."))
+ balloon_alert(user, "техпанель закрыта!")
return .
if(!I.use_tool(src, user, volume = I.tool_volume))
return .
@@ -226,7 +226,7 @@
emagged = 1
if(!open)
locked = !locked
- to_chat(user, span_notice("You [locked ? "lock" : "unlock"] [src]'s controls!"))
+ balloon_alert(user, "техпанель [locked ? "заблокирована" : "разблокирована"]")
flick("mulebot-emagged", src)
playsound(loc, 'sound/effects/sparks1.ogg', 100, FALSE)
@@ -266,7 +266,7 @@
if(prob(50) && !isnull(load))
unload(0)
if(prob(25))
- visible_message(span_danger("Something shorts out inside [src]!"))
+ visible_message(span_danger("Что-то замыкается внутри [declent_ru(GENITIVE)]!"))
wires.cut_random()
@@ -285,11 +285,11 @@
turn_off()
else if(cell && !open)
if(!turn_on())
- to_chat(usr, span_warning("You can't switch on [src]!"))
+ to_chat(usr, span_warning("Вы не можете включить !"))
return
else
return
- visible_message("[usr] switches [on ? "on" : "off"] [src].")
+ visible_message("[usr] [on ? "включает" : "выключает"] [declent_ru(GENITIVE)].")
if("cellremove")
if(open && cell && !usr.get_active_hand())
cell.update_icon()
@@ -298,8 +298,8 @@
cell.add_fingerprint(usr)
cell = null
- usr.visible_message(span_notice("[usr] removes the power cell from [src]."),
- span_notice("You remove the power cell from [src]."))
+ usr.visible_message(span_notice("[usr] вынул батарею из [declent_ru(GENITIVE)]."),
+ span_notice("Вы вынули батарею из [declent_ru(GENITIVE)]."))
if("cellinsert")
if(open && !cell)
var/obj/item/stock_parts/cell/C = usr.get_active_hand()
@@ -308,8 +308,8 @@
cell = C
C.add_fingerprint(usr)
- usr.visible_message(span_notice("[usr] inserts a power cell into [src]."),
- span_notice("You insert the power cell into [src]."))
+ usr.visible_message(span_notice("[usr] вставил батарею в [declent_ru(GENITIVE)]."),
+ span_notice("Вы вставили батарею в [declent_ru(GENITIVE)]."))
if("stop")
if(mode >= BOT_DELIVER)
bot_reset()
@@ -320,15 +320,15 @@
if(mode == BOT_IDLE || mode == BOT_DELIVER)
start_home()
if("destination")
- var/new_dest = input(usr, "Enter Destination:", name, destination) as null|anything in GLOB.deliverybeacontags
+ var/new_dest = input(usr, "Введите пункт назначения:", name, destination) as null|anything in GLOB.deliverybeacontags
if(new_dest)
set_destination(new_dest)
if("setid")
- var/new_id = tgui_input_text(usr, "Enter ID:", name, suffix, MAX_NAME_LEN)
+ var/new_id = tgui_input_text(usr, "Введите ID:", name, suffix, MAX_NAME_LEN)
if(new_id)
set_suffix(new_id)
if("sethome")
- var/new_home = input(usr, "Enter Home:", name, home_destination) as null|anything in GLOB.deliverybeacontags
+ var/new_home = input(usr, "Введите домашнюю точку:", name, home_destination) as null|anything in GLOB.deliverybeacontags
if(new_home)
home_destination = new_home
if("unload")
@@ -352,7 +352,7 @@
update_controls()
return TRUE
else
- to_chat(user, span_danger("Access denied."))
+ balloon_alert(user, "отказано в доступе!")
return FALSE
@@ -362,16 +362,16 @@
var/dat
dat += hack(user)
dat += showpai(user)
- dat += "Multiple Utility Load Effector Mk. V
"
+ dat += "Многофункциональный Узкоспециализированный Легкомоторный робот v5.0
"
dat += "ID: [suffix]
"
- dat += "Power: [on ? "On" : "Off"]
"
+ dat += "Питание: [on ? "Включён" : "Выключен"]
"
if(!open)
- dat += "Status
"
+ dat += "Состояние
"
dat += ""
switch(mode)
if(BOT_IDLE)
- dat += "Ready"
+ dat += "Готовность"
if(BOT_DELIVER)
dat += "[mode_name[BOT_DELIVER]]"
if(BOT_GO_HOME)
@@ -384,40 +384,40 @@
dat += "[mode_name[BOT_NO_ROUTE]]"
dat += "
"
- dat += "Current Load: [load ? load.name : "none"]
"
- dat += "Destination: [!destination ? "none" : destination]
"
- dat += "Power level: [cell ? cell.percent() : 0]%"
+ dat += "Груз [load ? load.name : "отсутствует"]
"
+ dat += "Пункт назначения: [!destination ? "отсутствует" : destination]
"
+ dat += "Заряд: [cell ? cell.percent() : 0]%"
if(locked && !ai && !user.can_admin_interact())
- dat += "
Controls are locked
Unlock Controls"
+ dat += "
Управление поведением заблокировано
Разблокировать"
else
- dat += "
Controls are unlocked
Lock Controls
"
-
- dat += "Toggle Power
"
- dat += "Stop
"
- dat += "Proceed
"
- dat += "Return to Home
"
- dat += "Set Destination
"
- dat += "Set Bot ID
"
- dat += "Set Home
"
- dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
"
- dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
"
- dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
"
+ dat += "
Управление поведением разблокировано
Заблокировать
"
+
+ dat += "Включить/Выключить
"
+ dat += "Остановиться
"
+ dat += "Продолжить движение
"
+ dat += "Возврат домой
"
+ dat += "Задать точку назначения
"
+ dat += "Задать ID роботу
"
+ dat += "Задать домашнюю точку
"
+ dat += "[auto_return ? "Включить":"Выключить"] автоматическое возвращение домой
"
+ dat += "[auto_return ? "Включить":"Выключить"] автоматический подбор ящиков
"
+ dat += "[auto_return ? "Включить":"Выключить"] автоматический отчёт о доставке
"
if(load)
- dat += "Unload Now
"
- dat += "The maintenance hatch is closed.
"
+ dat += "Разгрузиться
"
+ dat += "Панель технического обслуживания закрыта
"
else
if(!ai)
- dat += "The maintenance hatch is open.
"
- dat += "Power cell: "
+ dat += "Панель технического обслуживания открыта
"
+ dat += "Батарея: "
if(cell)
- dat += "Installed
"
+ dat += "Установлена
"
else
- dat += "Removed
"
+ dat += "Отсутствует
"
wires.Interact(user)
else
- dat += "The bot is in maintenance mode and cannot be controlled.
"
+ dat += "Робот в режиме технического обслуживания - управление поведением заблокировано
"
return dat
@@ -430,13 +430,13 @@
/mob/living/simple_animal/bot/mulebot/proc/buzz(type)
switch(type)
if(SIGH)
- audible_message("[src] makes a sighing buzz.")
+ audible_message("[capitalize(declent_ru(NOMINATIVE))] разочарованно гудит.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
if(ANNOYED)
- audible_message("[src] makes an annoyed buzzing sound.")
+ audible_message("[capitalize(declent_ru(NOMINATIVE))] раздражённо жужжит.")
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
if(DELIGHT)
- audible_message("[src] makes a delighted ping!")
+ audible_message("[capitalize(declent_ru(NOMINATIVE))] восторженно звенит!")
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
@@ -708,21 +708,21 @@
/mob/living/simple_animal/bot/mulebot/proc/at_target()
if(!reached_target)
radio_channel = "Supply" //Supply channel
- audible_message("[src] makes a chiming sound!")
+ audible_message("[capitalize(declent_ru(NOMINATIVE))] громко звенит!")
playsound(loc, 'sound/machines/chime.ogg', 50, 0)
reached_target = 1
if(pathset) //The AI called us here, so notify it of our arrival.
loaddir = dir //The MULE will attempt to load a crate in whatever direction the MULE is "facing".
if(calling_ai)
- to_chat(calling_ai, "[bicon(src)] [src] wirelessly plays a chiming sound!")
+ to_chat(calling_ai, "[bicon(src)] [capitalize(declent_ru(NOMINATIVE))] удалённо проигрывает звук звонка!")
playsound(calling_ai, 'sound/machines/chime.ogg',40, 0)
calling_ai = null
radio_channel = "AI Private" //Report on AI Private instead if the AI is controlling us.
if(load) // if loaded, unload at target
if(report_delivery)
- speak("Destination [destination] reached. Unloading [load].", radio_channel)
+ speak("Пункт назначения [destination] достигнут. Выгружаю [load].", radio_channel)
if(istype(load, /obj/structure/closet/crate))
var/obj/structure/closet/crate/C = load
C.notifyRecipient(destination)
@@ -741,7 +741,7 @@
if(AM && AM.Adjacent(src))
load(AM)
if(report_delivery)
- speak("Now loading [load] at [get_area(src)].", radio_channel)
+ speak("Загружаю [load] в локации [get_area(src)].", radio_channel)
// whatever happened, check to see if we return home
if(auto_return && home_destination && destination != home_destination)
@@ -787,14 +787,14 @@
// usually just bumps, but if avoidance disabled knock over mobs
if(isrobot(bumped_living))
- visible_message(span_danger("[src] bumps into [bumped_living]!"))
+ visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] врезается в [bumped_living]!"))
return .
if(paicard)
return .
add_attack_logs(src, bumped_living, "Knocked down")
- visible_message(span_danger("[src] knocks over [bumped_living]!"))
+ visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] сбивает [bumped_living]!"))
bumped_living.Weaken(16 SECONDS)
@@ -802,8 +802,8 @@
if(H.player_logged)//No running over SSD people
return
add_attack_logs(src, H, "Run over (DAMTYPE: [uppertext(BRUTE)])")
- H.visible_message(span_danger("[src] drives over [H]!"),
- span_userdanger("[src] drives over you!"))
+ H.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] переезжает [H]!"),
+ span_userdanger("[capitalize(declent_ru(NOMINATIVE))] переезжает вас!"))
playsound(loc, 'sound/effects/splat.ogg', 50, 1)
var/damage = rand(5, 15)
@@ -832,15 +832,15 @@
switch(command)
if("start")
if(load)
- to_chat(src, span_warningbig("DELIVER [load] TO [destination]"))
+ to_chat(src, span_warningbig("ДОСТАВИТЬ [load] В ЛОКАЦИЮ [destination]"))
else
- to_chat(src, span_warningbig("PICK UP DELIVERY AT [destination]"))
+ to_chat(src, span_warningbig("ЗАБРАТЬ ГРУЗ В ЛОКАЦИИ [destination]"))
if("unload", "load")
if(load)
- to_chat(src, span_warningbig("UNLOAD"))
+ to_chat(src, span_warningbig("ВЫГРУЗИТЬСЯ"))
else
- to_chat(src, span_warningbig("LOAD"))
+ to_chat(src, span_warningbig("ЗАГРУЗИТЬСЯ"))
if("autoret", "autopick", "target")
return
else
@@ -948,7 +948,7 @@
/mob/living/simple_animal/bot/mulebot/explode()
- visible_message(span_userdanger("[src] blows apart!"))
+ visible_message(span_userdanger("[capitalize(declent_ru(NOMINATIVE))] разлетается на части!"))
var/turf/Tsec = get_turf(src)
new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index bfd7453c1c0..9f9c4ed393c 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -3,7 +3,15 @@
/mob/living/simple_animal/bot/secbot
name = "\improper Securitron"
- desc = "A little security robot. He looks less than thrilled."
+ desc = "Маленький охранный робот. Он выглядит абсолютно спокойным."
+ ru_names = list(
+ NOMINATIVE = "охранный робот",
+ GENITIVE = "охранного робота",
+ DATIVE = "охранному роботу",
+ ACCUSATIVE = "охранного робота",
+ INSTRUMENTAL = "охранным роботом",
+ PREPOSITIONAL = "охранном роботе",
+ )
icon = 'icons/obj/aibots.dmi'
icon_state = "secbot0"
density = FALSE
@@ -19,10 +27,10 @@
bot_type = SEC_BOT
bot_filter = RADIO_SECBOT
model = "Securitron"
- bot_purpose = "seek out criminals, handcuff them, and report their location to security"
+ bot_purpose = "найти преступников, задержать их и доложить службе безопасности"
bot_core_type = /obj/machinery/bot_core/secbot
window_id = "autosec"
- window_name = "Automatic Security Unit v1.6"
+ window_name = "Автоматическая Охранная Единица v1.6"
path_image_color = "#FF0000"
data_hud_type = DATA_HUD_SECURITY_ADVANCED
@@ -55,7 +63,15 @@
/mob/living/simple_animal/bot/secbot/beepsky
name = "Officer Beepsky"
- desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."
+ desc = "Это Офицер Бипски! Работает с помощью картофеля и рюмки виски."
+ ru_names = list(
+ NOMINATIVE = "Офицер Бипски",
+ GENITIVE = "Офицера Бипски",
+ DATIVE = "Офицеру Бипски",
+ ACCUSATIVE = "Офицера Бипски",
+ INSTRUMENTAL = "Офицером Бипски",
+ PREPOSITIONAL = "Офицере Бипски",
+ )
idcheck = FALSE
weaponscheck = FALSE
auto_patrol = TRUE
@@ -72,13 +88,29 @@
/mob/living/simple_animal/bot/secbot/pingsky
name = "Officer Pingsky"
- desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
+ desc = "Это Офицер Пингски! Переведён на охрану спутника за разжигание античеловеческих настроений."
+ ru_names = list(
+ NOMINATIVE = "Офицер Пингски",
+ GENITIVE = "Офицера Пингски",
+ DATIVE = "Офицеру Пингски",
+ ACCUSATIVE = "Офицера Пингски",
+ INSTRUMENTAL = "Офицером Пингски",
+ PREPOSITIONAL = "Офицере Пингски",
+ )
radio_channel = "AI Private"
/mob/living/simple_animal/bot/secbot/ofitser
name = "Prison Ofitser"
- desc = "It's Prison Ofitser! Powered by the tears and sweat of prisoners."
+ desc = "Это Офицер Тюремски! Работает с помощью крови, пота и слёз заключённых."
+ ru_names = list(
+ NOMINATIVE = "Офицер Тюремски",
+ GENITIVE = "Офицера Тюремски",
+ DATIVE = "Офицеру Тюремски",
+ ACCUSATIVE = "Офицера Тюремски",
+ INSTRUMENTAL = "Офицером Тюремски",
+ PREPOSITIONAL = "Офицере Тюремски",
+ )
idcheck = FALSE
weaponscheck = TRUE
auto_patrol = TRUE
@@ -86,7 +118,15 @@
/mob/living/simple_animal/bot/secbot/buzzsky
name = "Officer Buzzsky"
- desc = "It's Officer Buzzsky! Rusted and falling apart, he seems less than thrilled with the crew for leaving him in his current state."
+ desc = "Это Офицер Баззски! Проржавевший и разваливающийся на части, он явно не в восторге от того, что экипаж оставил его в таком состоянии."
+ ru_names = list(
+ NOMINATIVE = "Офицер Баззски",
+ GENITIVE = "Офицера Баззски",
+ DATIVE = "Офицеру Баззски",
+ ACCUSATIVE = "Офицера Баззски",
+ INSTRUMENTAL = "Офицером Баззски",
+ PREPOSITIONAL = "Офицере Баззски",
+ )
base_icon = "rustbot"
icon_state = "rustbot0"
declare_arrests = FALSE
@@ -97,6 +137,14 @@
/mob/living/simple_animal/bot/secbot/armsky
name = "Sergeant-at-Armsky"
+ ru_names = list(
+ NOMINATIVE = "Офицер Арсеналски",
+ GENITIVE = "Офицера Арсеналски",
+ DATIVE = "Офицеру Арсеналски",
+ ACCUSATIVE = "Офицера Арсеналски",
+ INSTRUMENTAL = "Офицером Арсеналски",
+ PREPOSITIONAL = "Офицере Арсеналски",
+ )
health = 45
idcheck = TRUE
arrest_type = TRUE
@@ -106,6 +154,14 @@
/mob/living/simple_animal/bot/secbot/podsky
name = "Officer Podsky"
+ ru_names = list(
+ NOMINATIVE = "Офицер Подски",
+ GENITIVE = "Офицера Подски",
+ DATIVE = "Офицеру Подски",
+ ACCUSATIVE = "Офицера Подски",
+ INSTRUMENTAL = "Офицером Подски",
+ PREPOSITIONAL = "Офицере Подски",
+ )
health = 45
idcheck = TRUE
arrest_type = TRUE
@@ -152,9 +208,9 @@
/mob/living/simple_animal/bot/secbot/set_custom_texts()
- text_hack = "You overload [name]'s target identification system."
- text_dehack = "You reboot [name] and restore the target identification."
- text_dehack_fail = "[name] refuses to accept your authority!"
+ text_hack = "Вы взломали систему идентификации целей [declent_ru(GENITIVE)]."
+ text_dehack = "Вы восстановили систему идентификации целей [declent_ru(GENITIVE)]."
+ text_dehack_fail = "[capitalize(declent_ru(NOMINATIVE))] отказывается признавать вашу власть!"
/mob/living/simple_animal/bot/secbot/show_controls(mob/M)
@@ -192,7 +248,7 @@
if (..())
return
if(topic_denied(usr))
- to_chat(usr, "[src]'s interface is not responding!")
+ to_chat(usr, span_warning("Интерфейс [declent_ru(GENITIVE)] не отвечает!"))
return
add_fingerprint(usr)
. = TRUE
@@ -251,9 +307,9 @@
..()
if(emagged == 2)
if(user)
- to_chat(user, span_danger("You short out [src]'s target assessment circuits."))
+ to_chat(user, span_danger("Вы замыкаете микросхемы системы целеуказания [declent_ru(GENITIVE)]."))
oldtarget_name = user.name
- audible_message(span_danger("[src] buzzes oddly!"))
+ audible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] странно жужжит!"))
declare_arrests = FALSE
icon_state = "[base_icon][on]"
@@ -291,8 +347,8 @@
/mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C)
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2)
- C.visible_message(span_danger("[src] is trying to put zipties on [C]!"),
- span_userdanger("[src] is trying to put zipties on you!"))
+ C.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] начинает надевать стяжки на [C]!"),
+ span_userdanger("[capitalize(declent_ru(NOMINATIVE))] пытается надеть на вас стяжки!"))
addtimer(CALLBACK(src, PROC_REF(cuff_callback), C), 6 SECONDS)
@@ -304,6 +360,8 @@
return
C.apply_restraints(new /obj/item/restraints/handcuffs/cable/zipties/used(null), ITEM_SLOT_HANDCUFFED, TRUE)
+ C.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] надел стяжки на [C]!"),
+ span_userdanger("[capitalize(declent_ru(NOMINATIVE))] надел на вас стяжки!"))
playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
back_to_idle()
@@ -328,11 +386,11 @@
if(declare_arrests)
var/area/location = get_area(src)
if(!speak_cooldown)
- speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
+ speak("[arrest_type ? "Удерживаю" : "Задерживаю"] подонка по имени [C] в локации [location]. Уровень опасности - [threat].", radio_channel)
speak_cooldown = TRUE
addtimer(VARSET_CALLBACK(src, speak_cooldown, FALSE), SPEAK_COOLDOWN)
- C.visible_message(span_danger("[src] has [harmbaton ? "beaten" : "stunned"] [C]!"),
- span_userdanger("[src] has [harmbaton ? "beaten" : "stunned"] you!"))
+ C.visible_message(span_danger("[capitalize(declent_ru(NOMINATIVE))] [harmbaton ? "ударил" : "оглушил"] [C]!"),
+ span_userdanger("[capitalize(declent_ru(NOMINATIVE))] [harmbaton ? "ударил" : "оглушил"] вас!"))
/mob/living/simple_animal/bot/secbot/Life(seconds, times_fired)
@@ -483,9 +541,9 @@
else if(threatlevel >= 4)
target = C
oldtarget_name = C.name
- speak("Level [threatlevel] infraction alert!")
+ speak("Вижу преступника! Уровень опасности - [threatlevel]!")
playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
- visible_message("[src] points at [C.name]!")
+ visible_message("[capitalize(declent_ru(NOMINATIVE))] указывает на [C.name]!")
mode = BOT_HUNT
INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
break
@@ -501,7 +559,7 @@
/mob/living/simple_animal/bot/secbot/explode()
SSmove_manager.stop_looping(src)
- visible_message("[src] blows apart!")
+ visible_message(span_userdanger("[capitalize(declent_ru(NOMINATIVE))] разлетается на части!"))
var/turf/Tsec = get_turf(src)
var/obj/item/secbot_assembly/Sa = new /obj/item/secbot_assembly(Tsec)
Sa.build_step = 1
@@ -534,12 +592,12 @@
return
arrived.visible_message(span_warning("[pick( \
- "[arrived] dives out of [src]'s way!", \
- "[arrived] stumbles over [src]!", \
- "[arrived] jumps out of [src]'s path!", \
- "[arrived] trips over [src] and falls!", \
- "[arrived] topples over [src]!", \
- "[arrived] leaps out of [src]'s way!")]"))
+ "[arrived] спотыка[pluralize_ru(arrived.gender, "ет", "ют")]ся об [declent_ru(GENITIVE)]!", \
+ "[arrived] опрокидыва[pluralize_ru(arrived.gender, "ет", "ют")]ся на [declent_ru(GENITIVE)]!", \
+ "[arrived] отлета[pluralize_ru(arrived.gender, "ет", "ют")] с пути [declent_ru(GENITIVE)]!", \
+ "[capitalize(declent_ru(NOMINATIVE))] сбивает [arrived]!", \
+ "[capitalize(declent_ru(NOMINATIVE))] влетает в [arrived], заставляя [genderize_ru(arrived.gender, "его", "её", "его", "их")] упасть!", \
+ "[capitalize(declent_ru(NOMINATIVE))] опрокидывает [arrived]!")]"))
arrived.Weaken(4 SECONDS)
diff --git a/code/modules/mob/living/simple_animal/bot/syndicate.dm b/code/modules/mob/living/simple_animal/bot/syndicate.dm
index b26619937d0..c8bcbcd2c71 100644
--- a/code/modules/mob/living/simple_animal/bot/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/bot/syndicate.dm
@@ -1,7 +1,15 @@
/mob/living/simple_animal/bot/ed209/syndicate
name = "Syndicate Sentry Bot"
- desc = "A syndicate security bot."
+ desc = "Охранный робот Синдиката."
+ ru_names = list(
+ NOMINATIVE = "робот-часовой Синдиката",
+ GENITIVE = "робота-часового Синдиката",
+ DATIVE = "роботу-часовому Синдиката",
+ ACCUSATIVE = "робота-часового Синдиката",
+ INSTRUMENTAL = "роботом-часовым Синдиката",
+ PREPOSITIONAL = "роботе-часовом Синдиката",
+ )
model = "Guardian"
icon = 'icons/obj/mecha/mecha.dmi'
icon_state = "darkgygax"
@@ -17,7 +25,7 @@
shoot_sound = 'sound/weapons/wave.ogg'
anchored = TRUE
window_id = "syndiebot"
- window_name = "Syndicate Bot Interface"
+ window_name = "Интерфейс Часового Робота Синдиката"
var/turf/saved_turf
var/stepsound = 'sound/mecha/mechstep.ogg'
var/area/syndicate_depot/core/depotarea
@@ -54,7 +62,7 @@
/mob/living/simple_animal/bot/ed209/syndicate/ui_interact(mob/user, datum/tgui/ui = null)
- to_chat(user, span_warning("[src] has no accessible control panel!"))
+ balloon_alert(user, "панель управления отсутствует!")
return
@@ -79,7 +87,7 @@
/mob/living/simple_animal/bot/ed209/syndicate/emag_act(mob/user)
if(user)
- to_chat(user, span_warning("[src] has no card reader slot!"))
+ balloon_alert(user, "сканер ID-карт отсутствует!")
/mob/living/simple_animal/bot/ed209/syndicate/ed209_ai()
@@ -87,9 +95,9 @@
if(saved_turf && current_turf != saved_turf)
playsound(loc, stepsound, 40, TRUE)
if(spawn_turf && !atoms_share_level(src, spawn_turf))
- raise_alert("[src] lost in space.")
+ raise_alert("[capitalize(declent_ru(NOMINATIVE))] потерялся в пространстве.")
raised_alert = FALSE
- raise_alert("[src] activated self-destruct.")
+ raise_alert("[capitalize(declent_ru(NOMINATIVE))] активировал протокол само-уничтожения.")
qdel(src)
saved_turf = current_turf
switch(mode)
@@ -183,13 +191,13 @@
if(depotarea)
depotarea.list_remove(src, depotarea.guard_list)
SSmove_manager.stop_looping(src)
- visible_message(span_userdanger("[src] blows apart!"))
+ visible_message(span_userdanger("[capitalize(declent_ru(NOMINATIVE))] разлетается на части!"))
do_sparks(3, 1, src)
new /obj/effect/decal/cleanable/blood/oil(loc)
var/obj/structure/mecha_wreckage/gygax/dark/wreck = new /obj/structure/mecha_wreckage/gygax/dark(loc)
wreck.name = "sentry bot wreckage"
- raise_alert("[src] destroyed.")
+ raise_alert("[capitalize(declent_ru(NOMINATIVE))] уничтожен.")
qdel(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/animals_named.dm b/code/modules/mob/living/simple_animal/friendly/animals_named.dm
index 67c95e0edfa..a8b8f873064 100644
--- a/code/modules/mob/living/simple_animal/friendly/animals_named.dm
+++ b/code/modules/mob/living/simple_animal/friendly/animals_named.dm
@@ -55,6 +55,7 @@
/mob/living/simple_animal/pet/cat/white/Penny
name = "Копейка"
desc = "Любит таскать монетки и мелкие предметы. Успевайте прятать их!"
+ icon_state = "penny"
unique_pet = TRUE
gold_core_spawnable = NO_SPAWN
resting = TRUE
@@ -62,6 +63,7 @@
/mob/living/simple_animal/pet/cat/birman/Crusher
name = "Бедокур" //Не цель для воров
desc = "Любит крушить всё что не прикручено. Нужно вовремя прибираться."
+ icon_state = "crusher"
unique_pet = TRUE
gold_core_spawnable = NO_SPAWN
resting = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
index da1aa23923b..b9a6169ab4b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
@@ -244,6 +244,7 @@
speed = 4
pre_attack_icon = "Goliath_preattack"
throw_message = "does nothing to the rocky hide of the"
+ crusher_loot = /obj/item/crusher_trophy/eyed_tentacle
loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath = 2, /obj/item/stack/sheet/bone = 2)
crusher_drop_mod = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/marrow_weaver.dm b/code/modules/mob/living/simple_animal/hostile/mining/marrow_weaver.dm
index c70328f1574..2fd8b9fe08b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/marrow_weaver.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/marrow_weaver.dm
@@ -7,6 +7,7 @@
icon_aggro = "weaver"
icon_dead = "weaver_dead"
throw_message = "bounces harmlessly off the"
+ crusher_loot = /obj/item/crusher_trophy/fang
butcher_results = list(/obj/item/stack/ore/uranium = 2, /obj/item/stack/sheet/bone = 2, /obj/item/stack/sheet/sinew = 1, /obj/item/stack/sheet/animalhide/weaver_chitin = 3, /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg = 2)
loot = list()
attacktext = "кусает" //can we revert all translation in our code?
@@ -136,15 +137,20 @@
/mob/living/simple_animal/hostile/asteroid/marrowweaver/frost
name = "frostbite weaver"
desc = "A big, angry, venomous ice spider. It likes to snack on bone marrow. Its preferred food source is you."
+
icon_state = "weaver_ice"
icon_living = "weaver_ice"
icon_aggro = "weaver_ice"
icon_dead = "weaver_ice_dead"
+
melee_damage_lower = 10 //stronger venom, but weaker attack.
melee_damage_upper = 13
+
poison_type = "frostoil"
poison_per_bite = 5
+ crusher_loot = /obj/item/crusher_trophy/gland
+
/mob/living/simple_animal/hostile/asteroid/marrowweaver/tendril
fromtendril = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index 51e1eb36e97..67d6e7c574c 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -261,9 +261,9 @@
desc = "Большой дрон. Кажется, неактивен."
w_class = WEIGHT_CLASS_GIGANTIC
item_flags = NOPICKUP
- icon_state = "unactive_drone"
+ icon_state = "inactive_drone"
-/obj/item/unactive_drone/attackby(obj/item/I, mob/user, params)
+/obj/item/inactive_drone/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/drone_modules/drone_BCM))
to_chat(user, span_notice("Вы установили модуль в слот."))
new /mob/living/simple_animal/bot/ed209/combat_drone(get_turf(src))
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index 4e7980f1115..21398a3f0aa 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -72,7 +72,7 @@
return FALSE
if(!can_ventcrawl(ventcrawl_target))
return FALSE
- return stop_ventcrawling(ventcrawl_target)
+ return stop_ventcrawling()
//Entrance here
if(!can_ventcrawl(ventcrawl_target, entering = TRUE))
@@ -124,12 +124,11 @@
* Moves living mob to the turf contents and cleanse ventcrawling stuff
*
* Arguments:
- * * ventcrawl_target - The vent from which we are moved from
* * message - if TRUE shows visible message to everyone
*
* Returns `TRUE` on success.
*/
-/mob/living/proc/stop_ventcrawling(obj/machinery/atmospherics/ventcrawl_target, message = TRUE)
+/mob/living/proc/stop_ventcrawling(message = TRUE)
SHOULD_CALL_PARENT(TRUE)
if(!is_ventcrawling(src))
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 42713971a0a..075c44d9ffd 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -58,7 +58,8 @@
SPECIAL_ROLE_TRAITOR,
SPECIAL_ROLE_VAMPIRE,
SPECIAL_ROLE_VAMPIRE_THRALL,
- SPECIAL_ROLE_THIEF
+ SPECIAL_ROLE_THIEF,
+ SPECIAL_ROLE_MALFAI
)
if(special_role in crew_roles)
return 0
diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm
index 57e0f7a3e71..0a049d1c53f 100644
--- a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm
+++ b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm
@@ -963,3 +963,43 @@
/datum/sprite_accessory/hair/undercutfem
name = "Female undercut"
icon_state = "undercut_fem"
+
+/datum/sprite_accessory/hair/ponytail8
+ name = "Ponytail 8"
+ icon_state = "ponytail8"
+
+/datum/sprite_accessory/hair/tribalbraid
+ name = "Tribal Braid"
+ icon_state = "tribalbraid"
+
+/datum/sprite_accessory/hair/jill
+ name = "Jill"
+ icon_state = "jill"
+
+/datum/sprite_accessory/hair/sabitsuki
+ name = "Sabitsuki"
+ icon_state = "sabitsuki"
+
+/datum/sprite_accessory/hair/kobeni
+ name = "Kobeni"
+ icon_state = "kobeni_l"
+
+/datum/sprite_accessory/hair/gloomy
+ name = "Gloomy"
+ icon_state = "gloomylong"
+
+/datum/sprite_accessory/hair/elize
+ name = "Elize"
+ icon_state = "elize"
+
+/datum/sprite_accessory/hair/bunstick
+ name = "Asian Bun"
+ icon_state = "bunstick"
+
+/datum/sprite_accessory/hair/kitty
+ name = "Kitty"
+ icon_state = "kitty"
+
+/datum/sprite_accessory/hair/dolly
+ name = "Dolly"
+ icon_state = "dolly"
diff --git a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
index 6b6963cfa98..37da87aca6b 100644
--- a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
+++ b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
@@ -104,32 +104,32 @@
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_pink
name = "Pink Hesphiastos Screen"
icon_state = "pink_hesp_alt"
- models_allowed = list("Industrial Revolution")
+ models_allowed = list("Titan Enforcer")
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_orange
name = "Orange Hesphiastos Screen"
icon_state = "orange_hesp_alt"
- models_allowed = list("Industrial Revolution")
+ models_allowed = list("Titan Enforcer")
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_goggle
name = "Goggles Hesphiastos Screen"
icon_state = "goggles_hesp_alt"
- models_allowed = list("Industrial Revolution")
+ models_allowed = list("Titan Enforcer")
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_scroll
name = "Scrolling Hesphiastos Screen"
icon_state = "scroll_hesp_alt"
- models_allowed = list("Industrial Revolution")
+ models_allowed = list("Titan Enforcer")
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_rgb
name = "RGB Hesphiastos Screen"
icon_state = "rgb_hesp_alt"
- models_allowed = list("Industrial Revolution")
+ models_allowed = list("Titan Enforcer")
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_rainbow
name = "Rainbow Hesphiastos Screen"
icon_state = "rainbow_hesp_alt"
- models_allowed = list("Industrial Revolution")
+ models_allowed = list("Titan Enforcer")
//Fluff
/datum/sprite_accessory/hair/ipc/fluff
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index cda28a116c5..8617697874b 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -413,3 +413,8 @@
name = "emitter gun power cell"
maxcharge = 2200
chargerate = 100
+
+/obj/item/stock_parts/cell/degraded
+ name = "degraded power cell"
+ maxcharge = 750
+ chargerate = 25
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 644ba9ec05d..8ff7699a8b3 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -337,10 +337,12 @@
track = TRACKER_AUTO
autostart = TRUE // Automatically search for connected devices
-/obj/machinery/power/solar_control/Initialize()
+/obj/machinery/power/solar_control/Initialize(mapload, obj/structure/computerframe)
SSsun.solars |= src
setup()
. = ..()
+ if(computerframe)
+ qdel(computerframe)
/obj/machinery/power/solar_control/proc/setup()
connect_to_network()
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index bc9c412f1a8..22cc44d667f 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -65,7 +65,7 @@
/obj/machinery/computer/turbine_computer
name = "gas turbine control computer"
- desc = "A computer to remotely control a gas turbine"
+ desc = "Компьютер для дистанционного управления газовой турбиной."
icon_screen = "turbinecomp"
icon_keyboard = "tech_key"
circuit = /obj/item/circuitboard/turbine_computer
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index ad228160606..c013870a107 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -153,7 +153,7 @@
icon_state = "10mmbox"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/c10mm
- max_ammo = 20
+ max_ammo = 30
/obj/item/ammo_box/fortynr
name = "ammo box 40N&R"
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index cec3aa208d4..1e1cb7e47c7 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -68,9 +68,18 @@
ammo_x_offset = 1
can_charge = FALSE
selfcharge = TRUE
+ var/emagged = FALSE
/obj/item/gun/energy/floragun/emag_act(mob/user)
. = ..()
+
+ if(emagged)
+ return
+
+ if(user)
+ balloon_alert(user, "протоколы защиты сняты!")
+
+ emagged = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/flora/alpha/emag, /obj/item/ammo_casing/energy/flora/beta, /obj/item/ammo_casing/energy/flora/gamma)
update_ammo_types()
@@ -821,7 +830,7 @@
icon_state = "plasmagun"
item_state = "plasmagun"
w_class = WEIGHT_CLASS_NORMAL
- origin_tech = "combat=4;magnets=4;powerstorage=3"
+ origin_tech = "combat=6;magnets=5;powerstorage=3"
ammo_type = list(/obj/item/ammo_casing/energy/weak_plasma, /obj/item/ammo_casing/energy/charged_plasma)
shaded_charge = 1
can_holster = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 04e95abae32..e6c201a8d56 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/pandemic
name = "PanD.E.M.I.C 2200"
- desc = "Used to work with viruses."
+ desc = "Используется для работы с вирусами."
density = TRUE
anchored = TRUE
icon = 'icons/obj/chemical.dmi'
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 9f70f5374ee..127c1c113ec 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -135,6 +135,12 @@
/obj/item/reagent_containers/spray/cleaner/medical/empty
list_reagents = list()
+/obj/item/reagent_containers/spray/cleaner/tactical
+ name = "Tactical cleaner"
+ desc = "Бутылочка из прочнейшего тёмно-синего пластика, распылитель чёрного цвета украшен тактическим снаряжением, разработана уборочно-силовыми структурами Нанотрейзен для ЗАЧИСТКИ и контроля грязи в помещениях."
+ icon_state = "cleaner_tactical"
+ item_state = "cleaner_tactical"
+
/obj/item/reagent_containers/spray/blue_cleaner
name = "bluespace cleaner"
desc = "A spray with an increased storage of reagents, or it's not that simple...."
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index f3e556d0bfc..cc2c646014a 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -50,6 +50,7 @@
/obj/machinery/disposal/Initialize(mapload, obj/structure/disposalconstruct/made_from)
// this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
. = ..()
+ air_contents = new
if(made_from)
setDir(made_from.dir)
return INITIALIZE_HINT_LATELOAD
@@ -60,7 +61,6 @@
var/datum/gas_mixture/env = new
env.copy_from(loc.return_air())
var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
- air_contents = new
air_contents.merge(removed)
trunk_check()
update()
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 38cdb253772..ee47d5e60bd 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -941,7 +941,7 @@
name = "Ammo Box (10mm)"
id = "c10mm"
build_type = AUTOLATHE
- materials = list(MAT_METAL = 30500)
+ materials = list(MAT_METAL = 45750)
build_path = /obj/item/ammo_box/c10mm
category = list("hacked", "Security")
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index eab2fb0d521..2720519793c 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -369,3 +369,13 @@
materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_SILVER = 2000, MAT_DIAMOND = 1500)
build_path = /obj/item/t_scanner/science
category = list("Equipment")
+
+/datum/design/holotool
+ name = "holotool"
+ desc = "A highly experimental holographic tool projector"
+ id = "holotool"
+ req_tech = null //only from disks
+ build_type = PROTOLATHE
+ materials = list(MAT_SILVER = 2000, MAT_TITANIUM = 4000, MAT_DIAMOND = 2000, MAT_BLUESPACE = 2000)
+ build_path = /obj/item/holotool
+ category = list("Equipment")
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 060f7660fe1..e361291f828 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -1816,3 +1816,314 @@
construction_time = 5 SECONDS
build_path = /obj/item/borg/upgrade/syndie_rcd
category = list("Syndicate")
+
+//Paintkits
+/datum/design/paint_ripley_titan
+ name = "Ripley, Firefighter \"Titan's Fist\""
+ id = "p_titan"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5)
+ build_path = /obj/item/paintkit/ripley_titansfist
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_ripley_earth
+ name = "Ripley, Firefighter \"Strike the Earth!\""
+ id = "p_earth"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5)
+ build_path = /obj/item/paintkit/ripley_mercenary
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_ripley_red
+ name = "Ripley, Firefighter \"Firestarter\""
+ id = "p_red"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "toxins" = 5)
+ build_path = /obj/item/paintkit/ripley_red
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_firefighter_hauler
+ name = "Ripley, Firefighter \"Hauler\""
+ id = "p_hauler"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "programming" = 5)
+ build_path = /obj/item/paintkit/firefighter_Hauler
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_firefighter_zairjah
+ name = "Ripley, Firefighter \"Zairjah\""
+ id = "p_zairjah"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "programming" = 5, "toxins" = 5)
+ build_path = /obj/item/paintkit/firefighter_zairjah
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_firefighter_combat
+ name = "Ripley, Firefighter \"Combat Ripley\""
+ id = "p_combat"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5)
+ build_path = /obj/item/paintkit/firefighter_combat
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_firefighter_reaper
+ name = "Ripley, Firefighter \"Reaper\""
+ id = "p_reaper"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5,"toxins" = 5)
+ build_path = /obj/item/paintkit/firefighter_Reaper
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_firefighter_aluminizer
+ name = "Ripley, Firefighter \"Aluminizer\""
+ id = "p_aluminizer"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "programming" = 5,"toxins" = 5)
+ build_path = /obj/item/paintkit/firefighter_aluminizer
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_ripley_nt
+ name = "Ripley, Firefighter \"NT Special\""
+ id = "p_ripleynt"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5)
+ build_path = /obj/item/paintkit/ripley_nt
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 2000, MAT_GLASS = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_clarke_orangey
+ name = "Clarke \"Orangey\""
+ id = "p_orangey"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "toxins" = 5)
+ build_path = /obj/item/paintkit/clarke_orangey
+ materials = list(MAT_METAL = 20000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_clarke_spiderclarke
+ name = "Clarke \"Spiderclarke\""
+ id = "p_spiderclarke"
+ build_type = MECHFAB
+ req_tech = list("combat" = 4, "engineering" = 5, "materials" = 5, "toxins" = 5)
+ build_path = /obj/item/paintkit/clarke_spiderclarke
+ materials = list(MAT_METAL = 20000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_odysseus_hermes
+ name = "Odysseus \"Hermes\""
+ id = "p_hermes"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "programming" = 5,"biotech" = 5)
+ build_path = /obj/item/paintkit/odysseus_hermes
+ materials = list(MAT_METAL = 20000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_odysseus_reaper
+ name = "Odysseus \"Reaper\""
+ id = "p_odyreaper"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5, "toxins" = 5)
+ build_path = /obj/item/paintkit/odysseus_death
+ materials = list(MAT_METAL = 20000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_gygax_alt
+ name = "Gygax \"Old\""
+ id = "p_altgygax"
+ build_type = MECHFAB
+ req_tech = list("combat" = 4, "engineering" = 5, "materials" = 5, "programming" = 4)
+ build_path = /obj/item/paintkit/gygax_alt
+ materials = list(MAT_METAL = 30000, MAT_DIAMOND = 3000, MAT_URANIUM = 3000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_gygax_pobeda
+ name = "Gygax \"Pobeda\""
+ id = "p_pobedagygax"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 4, "materials" = 4, "programming" = 6)
+ build_path = /obj/item/paintkit/gygax_pobeda
+ materials = list(MAT_METAL = 30000, MAT_DIAMOND = 3000, MAT_URANIUM = 3000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_gygax_white
+ name = "Gygax \"White\""
+ id = "p_whitegygax"
+ build_type = MECHFAB
+ req_tech = list("biotech" = 4, "engineering" = 4, "materials" = 5, "programming" = 3 )
+ build_path = /obj/item/paintkit/gygax_white
+ materials = list(MAT_METAL = 30000, MAT_DIAMOND = 3000, MAT_URANIUM = 3000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_gygax_medgax
+ name = "Gygax \"Medgax\""
+ id = "p_medgax"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 5, "programming" = 6,"biotech" = 6, "toxins" = 6)
+ build_path = /obj/item/paintkit/gygax_medgax
+ materials = list(MAT_METAL = 30000, MAT_DIAMOND = 3000, MAT_URANIUM = 3000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_gygax_black
+ name = "Gygax \"Syndicate\""
+ id = "p_blackgygax"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 5, "materials" = 6, "programming" = 5, "syndicate" = 3)
+ build_path = /obj/item/paintkit/gygax_syndie
+ materials = list(MAT_METAL = 30000, MAT_DIAMOND = 3000, MAT_URANIUM = 3000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_gygax_pirate
+ name = "Gygax \"Pirate\""
+ id = "p_pirategygax"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6)
+ build_path = /obj/item/paintkit/gygax_pirate
+ materials = list(MAT_METAL = 30000, MAT_DIAMOND = 3000, MAT_URANIUM = 3000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_durand_unathi
+ name = "Durand \"Kharn MK. IV\""
+ id = "p_unathi"
+ build_type = MECHFAB
+ req_tech = list("materials" = 6, "biotech" = 6)
+ build_path = /obj/item/paintkit/durand_unathi
+ materials = list(MAT_METAL = 40000, MAT_DIAMOND = 4000, MAT_URANIUM = 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_durand_shire
+ name = "Durand \"Shire\""
+ id = "p_shire"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6)
+ build_path = /obj/item/paintkit/durand_shire
+ materials = list(MAT_METAL = 40000, MAT_DIAMOND = 4000, MAT_URANIUM = 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_durand_pirate
+ name = "Durand \"Pirate\""
+ id = "p_durandpirate"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6)
+ build_path = /obj/item/paintkit/durand_pirate
+ materials = list(MAT_METAL = 40000, MAT_DIAMOND = 4000, MAT_URANIUM = 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_durand_nt
+ name = "Durand \"NT Special\""
+ id = "p_durandnt"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6)
+ build_path = /obj/item/paintkit/durand_nt
+ materials = list(MAT_METAL = 40000, MAT_DIAMOND = 4000, MAT_URANIUM = 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_durand_soviet
+ name = "Durand \"Dollhouse\""
+ id = "p_soviet"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6, "toxins" = 6)
+ build_path = /obj/item/paintkit/durand_soviet
+ materials = list(MAT_METAL = 40000, MAT_DIAMOND = 4000, MAT_URANIUM = 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_durand_executor
+ name = "Durand \"mk.V Executioner\""
+ id = "p_executor"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6)
+ build_path = /obj/item/paintkit/durand_executor
+ materials = list(MAT_METAL = 40000, MAT_DIAMOND = 4000, MAT_SILVER = 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_phazon_imperion
+ name = "Phazon \"Imperion\""
+ id = "p_imperion"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 6, "engineering" = 6, "materials" = 6, "programming" = 6, "toxins" = 5)
+ build_path = /obj/item/paintkit/phazon_imperion
+ materials = list(MAT_METAL = 50000, MAT_DIAMOND = 4000, MAT_BLUESPACE = 4000)
+ construction_time = 40 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_phazon_janus
+ name = "Phazon \"Janus\""
+ id = "p_janus"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 6, "engineering" = 6, "materials" = 6, "programming" = 6, "toxins" = 5)
+ build_path = /obj/item/paintkit/phazon_janus
+ materials = list(MAT_METAL = 50000, MAT_DIAMOND = 4000, MAT_BLUESPACE = 4000)
+ construction_time = 40 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_phazon_plazmus
+ name = "Phazon \"Plazmus\""
+ id = "p_plazmus"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 6, "engineering" = 6, "materials" = 6, "toxins" = 5)
+ build_path = /obj/item/paintkit/phazon_plazmus
+ materials = list(MAT_METAL = 50000, MAT_DIAMOND = 4000, MAT_PLASMA = 5000)
+ construction_time = 40 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_phazon_blanco
+ name = "Phazon \"Blanco\""
+ id = "p_blanco"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 7, "engineering" = 7, "materials" = 7, "toxins" = 6)
+ build_path = /obj/item/paintkit/phazon_blanco
+ materials = list(MAT_METAL = 50000, MAT_DIAMOND = 4000, MAT_BLUESPACE = 4000)
+ construction_time = 40 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_phazon_nt
+ name = "Phazon \"NT Special\""
+ id = "p_phazonnt"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 7, "engineering" = 7, "materials" = 7, "toxins" = 6)
+ build_path = /obj/item/paintkit/phazon_nt
+ materials = list(MAT_METAL = 50000, MAT_DIAMOND = 4000, MAT_BLUESPACE = 4000)
+ construction_time = 40 SECONDS
+ category = list("Exosuit Paintkits")
+
+/datum/design/paint_ashed
+ name = "Ashed \"Mechs\""
+ id = "p_ashed"
+ build_type = MECHFAB
+ req_tech = list("engineering" = 5, "materials" = 6)
+ build_path = /obj/item/paintkit/ashed
+ materials = list(MAT_METAL = 20000, MAT_PLASMA = 8000, MAT_GLASS = 8000)
+ construction_time = 20 SECONDS
+ category = list("Exosuit Paintkits")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 0e910583054..19158649a7a 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -265,6 +265,17 @@
build_path = /obj/item/bonesetter/laser
category = list("Medical")
+/datum/design/item/laserfullkit
+ name = "Advanced Surgery Kit"
+ desc = "Полный набор современных хирургических инструментов."
+ id = "laser_fullsurgerykit"
+ req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5)
+ build_path = /obj/item/storage/toolbox/surgery/advanced
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 13000, MAT_GLASS = 10000, MAT_SILVER = 6000, MAT_GOLD = 6000)
+ category = list("Medical")
+
+
/datum/design/alienscalpel
name = "Alien Scalpel"
desc = "An advanced scalpel obtained through Abductor technology."
@@ -355,6 +366,16 @@
materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500)
category = list("Medical")
+/datum/design/alienfullkit
+ name = "Alien Surgery Kit"
+ desc = "Полный набор инопланетных хирургических инструментов."
+ id = "alien_fullsurgerykit"
+ req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3)
+ build_path = /obj/item/storage/toolbox/surgery/alien
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 34500, MAT_SILVER = 16000, MAT_PLASMA = 5500, MAT_TITANIUM = 13500)
+ category = list("Medical")
+
/////////////////////////////////////////
//////////Cybernetic Implants////////////
/////////////////////////////////////////
@@ -796,3 +817,13 @@
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_SILVER = 800, MAT_GLASS = 800, MAT_DIAMOND = 600, MAT_GOLD = 400)
category = list("Medical")
+
+/datum/design/bbag
+ name = "bluespace bodybag"
+ desc = "A bluespace body bag designed for the storage and transportation of cadavers."
+ id = "bbag"
+ req_tech = null //only for roboquests
+ build_type = PROTOLATHE
+ materials = list(MAT_SILVER = 1200, MAT_GLASS = 800, MAT_DIAMOND = 1200, MAT_GOLD = 400, MAT_BLUESPACE = 2000)
+ build_path = /obj/item/bodybag/bluespace
+ category = list("Medical")
diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
index 5343d100fbd..e4c4cd22b39 100644
--- a/code/modules/research/designs/mining_designs.dm
+++ b/code/modules/research/designs/mining_designs.dm
@@ -111,3 +111,13 @@
materials = list(MAT_METAL = 4000, MAT_PLASMA = 6000, MAT_URANIUM = 1000)
build_path = /obj/item/grenade/plastic/miningcharge/mega
category = list("Mining")
+
+/datum/design/fishingrod
+ name = "Fishing Rod"
+ desc = "Hey! I caught a miner!"
+ id = "fishingrod"
+ req_tech = list("materials" = 5, "engineering" = 4, "plasmatech" = 6, "biotech" = 6)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 10000, MAT_TITANIUM = 15000, MAT_SILVER = 2500, MAT_DIAMOND = 2500)
+ build_path = /obj/item/twohanded/fishingrod
+ category = list("Mining")
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 320b7c01d8a..1f96ed55fb1 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -120,7 +120,7 @@
category = list("Weapons")
/datum/design/plasmapistol
- name = "Plasma Pistol"
+ name = "Toxin Pistol"
desc = "A specialized firearm designed to fire lethal bolts of toxins."
id = "ppistol"
req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 5)
@@ -359,7 +359,7 @@
category = list("ILLEGAL")
/datum/design/stechkin
- name = "Stechkin pistol"
+ name = "Stechkin Pistol"
desc = "A reverse-engineered small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
id = "stechkin"
req_tech = list("combat" = 6, "engineering" = 6, "syndicate" = 5)
@@ -370,7 +370,7 @@
category = list("ILLEGAL")
/datum/design/chameleon_kit
- name = "Chameleon kit"
+ name = "Chameleon Kit"
desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station." // "Набор хамелеона изученный с помощью реверс инженеринга."
id = "chameleon_kit"
req_tech = list("combat" = 4, "engineering" = 6, "syndicate" = 3, "magnets" = 5)
@@ -381,7 +381,7 @@
category = list("ILLEGAL")
/datum/design/chameleon_hud
- name = "Chameleon hud"
+ name = "Chameleon Security HUD"
desc = "A stolen Nanotrasen Security HUD with Syndicate chameleon technology implemented into it. Similarly to a chameleon jumpsuit, the HUD can be morphed into various other eyewear, while retaining the HUD qualities when worn."
id = "chameleon_hud"
req_tech = list("combat" = 4, "engineering" = 6, "syndicate" = 3, "magnets" = 5)
@@ -392,7 +392,7 @@
category = list("ILLEGAL")
/datum/design/e_dagger
- name = "Energy dagger"
+ name = "Energy Dagger"
desc = "A dagger made of energy that looks and functions as a pen when off."
id = "e_dagger"
req_tech = list("combat" = 7, "programming" = 7, "syndicate" = 2, "materials" = 7)
@@ -403,7 +403,7 @@
category = list("ILLEGAL")
/datum/design/a_tuner
- name = "Acces tuner"
+ name = "Access Tuner"
desc = "The access tuner is a small device that can interface with airlocks from range. It takes a few seconds to connect and can change the bolt state, open the door, or toggle emergency access."
id = "a_tuner"
req_tech = list("programming" = 7, "syndicate" = 4, "materials" = 7)
@@ -414,7 +414,7 @@
category = list("ILLEGAL")
/datum/design/c_flash
- name = "Camera flash"
+ name = "Camera Flash"
desc = "A flash disguised as a camera with a self-charging safety system preventing the flash from burning out."
id = "c_flash"
req_tech = list("combat" = 7, "programming" = 6, "syndicate" = 3)
@@ -425,7 +425,7 @@
category = list("ILLEGAL")
/datum/design/dna_scrambler
- name = "DNA scrambler"
+ name = "DNA Scrambler"
desc = "A syringe with one injection that randomizes appearance and name upon use. A cheaper but less versatile alternative to an agent card and voice changer."
id = "dna_scrambler"
req_tech = list("biotech" = 7, "programming" = 7, "syndicate" = 3)
@@ -437,7 +437,7 @@
category = list("ILLEGAL")
/datum/design/c_bug
- name = "Camera bug"
+ name = "Camera Bug"
desc = "Enables you to view all cameras on the network to track a target."
id = "c_bug"
req_tech = list("materials" = 5, "programming" = 7, "syndicate" = 2)
@@ -459,7 +459,7 @@
category = list("ILLEGAL")
/datum/design/adv_pointer
- name = "Advanced pinpointer"
+ name = "Advanced Pinpointer"
desc = "A pinpointer that tracks any specified coordinates, DNA string, high value item or the nuclear authentication disk."
id = "adv_pointer"
req_tech = list("materials" = 7, "programming" = 7, "syndicate" = 4)
@@ -470,7 +470,7 @@
category = list("ILLEGAL")
/datum/design/encryptionkey_binary
- name = "Binary encryptionkey"
+ name = "Binary Encryptionkey"
desc = "An encryption key for a radio headset. To access the binary channel, use :+." // "Ключ шифрования, на которой переговариваеются борги и ИИ."
id = "binarykey"
req_tech = list("engineering" = 4, "syndicate" = 3, "programming" = 4,"materials" = 3)
@@ -481,7 +481,7 @@
category = list("ILLEGAL")
/datum/design/encryptionkey_syndicate
- name = "Syndicate encryptionkey"
+ name = "Syndicate Encryptionkey"
desc = "An encyption key for a radio headset. Contains syndicate cypherkeys." // "Ключ шифрования синдиката, позволяющий перехватывать другие зашифрованные радиоволны."
id = "syndicatekey"
req_tech = list("engineering" = 4, "syndicate" = 3, "programming" = 4,"materials" = 3)
@@ -492,7 +492,7 @@
category = list("ILLEGAL")
/datum/design/aiModule_syndicate
- name = "Hacked AI module"
+ name = "Hacked AI Module"
desc = "A hacked AI law module"
id = "syndiaimodule"
req_tech = list("syndicate" = 6, "programming" = 5, "materials" = 5)
@@ -503,7 +503,7 @@
category = list("ILLEGAL")
/datum/design/incendiary_10mm
- name = "pistol magazine 10mm incendiary"
+ name = "Pistol Magazine 10mm Incendiary"
desc = "A gun magazine. Loaded with rounds which ignite the target."
id = "10mminc"
req_tech = list("combat" = 4, "syndicate" = 2, "materials" = 4)
@@ -514,7 +514,7 @@
category = list("ILLEGAL")
/datum/design/radio_jammer
- name = "radio jammer"
+ name = "Radio Jammer"
desc = "Device used to disrupt nearby radio communication."
id = "jammer"
req_tech = list("engineering" = 4, "syndicate" = 3, "programming" = 3, "materials" = 4)
@@ -536,7 +536,7 @@
category = list("ILLEGAL")
/datum/design/syndie_rcd_ammo
- name = "suspicious matter cartridge"
+ name = "Suspicious Matter Cartridge"
desc = "Highly compressed matter for the RCD."
id = "syndie_rcd_ammo"
req_tech = list("materials" = 3, "syndicate" = 3)
@@ -546,7 +546,7 @@
category = list("ILLEGAL")
/datum/design/syndie_rcd_ammo_large
- name = "large suspicious matter cartridge"
+ name = "Large Suspicious Matter Cartridge"
desc = "Highly compressed matter for the RCD."
id = "syndie_rcd_ammo_large"
req_tech = list("materials" = 3, "syndicate" = 3)
@@ -567,7 +567,7 @@
category = list("ILLEGAL")
/datum/design/pyroclaw
- name = "Fusion gauntlets"
+ name = "Fusion Gauntlets"
desc = "A pair of gloves designed to make superheated claws capable of cutting through almost anything. Needs a pyro anomaly core"
id = "pyro_gloves"
req_tech = list("combat" = 7, "materials" = 7, "engineering" = 7, "plasmatech" = 7)
@@ -575,3 +575,14 @@
materials = list(MAT_METAL = 10000, MAT_GLASS = 5000, MAT_SILVER = 4000, MAT_TITANIUM = 4000, MAT_PLASMA = 8000)
build_path = /obj/item/clothing/gloves/color/black/pyro_claws
category = list("Weapons")
+
+/datum/design/real_plasma_pistol
+ name = "Plasma Pistol"
+ desc = "HA specialized firearm designed to fire heated bolts of plasma. Can be overloaded for a high damage shield breaking shot."
+ id = "real_plasma_pistol"
+ req_tech = null
+ build_type = PROTOLATHE
+ materials = list(MAT_SILVER = 6000, MAT_TITANIUM = 4000, MAT_PLASMA = 4000)
+ build_path = /obj/item/gun/energy/plasma_pistol
+ locked = TRUE
+ category = list("Weapons")
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 78594494b1d..8de8ec25b37 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -347,18 +347,21 @@
cloneCount = badThingCoeff
investigate_log("Experimentor has made a clone of [exp_on]", INVESTIGATE_EXPERIMENTOR)
ejectItem()
+
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!")
for(var/mob/living/m in oview(1, src))
m.apply_effect(25,IRRADIATE)
investigate_log("Experimentor has irradiated [key_name_log(m)]", INVESTIGATE_EXPERIMENTOR) //One entry per person so we know what was irradiated.
ejectItem(TRUE)
+
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing toxic waste!")
for(var/turf/T in oview(1, src))
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH))
new /obj/effect/decal/cleanable/greenglow(T)
+
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
var/savedName = "[exp_on]"
ejectItem(TRUE)
@@ -369,19 +372,14 @@
if(istype(loaded_item,/obj/item/grenade/chem_grenade))
var/obj/item/grenade/chem_grenade/CG = loaded_item
CG.prime()
+
ejectItem()
+
else if(prob(EFFECT_PROB_VERYLOW))
visible_message("The [exp_on] has activated an unknown subroutine!")
clone_next = TRUE
ejectItem()
qdel(exp_on)
-
- var/T = rand(1, linked_console.files.known_tech.len)
- var/datum/tech/KT = linked_console.files.known_tech[linked_console.files.known_tech[T]]
- var/new_level = linked_console.files.UpdateTech(linked_console.files.known_tech[T], KT.level + 1)
- var/tech_log = "[T] [new_level], "
- if(tech_log)
- investigate_log("[usr] increased tech experimentoring [loaded_item]: [tech_log]. ", INVESTIGATE_RESEARCH)
else
exp = FAIL
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 36984648825..a14e5fac182 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -95,6 +95,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/ui_theme = "Nanotrasen" //Тема интерфейса
+
/proc/CallTechName(ID) //A simple helper proc to find the name of a tech with a given ID.
for(var/T in subtypesof(/datum/tech))
var/datum/tech/tt = T
@@ -479,34 +480,44 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(istype(S, /obj/machinery/r_n_d/server/core) || istype(S, /obj/machinery/r_n_d/server/centcom))
S.add_usage_log(usr, being_built, machine)
+
/obj/machinery/computer/rdconsole/proc/finish_machine(mob/user, amount, enough_materials, obj/machinery/r_n_d/machine, datum/design/being_built, coeff)
if(machine)
if(enough_materials && being_built)
investigate_log("[key_name_log(user)] built [amount] of [being_built.build_path] via [machine].", INVESTIGATE_RESEARCH)
+
+ var/locked = being_built.locked && !is_taipan(z)
for(var/i in 1 to amount)
var/obj/new_item = new being_built.build_path(src)
if(istype(new_item, /obj/item/storage/backpack/holding))
new_item.investigate_log("built by [key_name_log(user)]", INVESTIGATE_ENGINE)
+
if(isitem(new_item) && !istype(new_item, /obj/item/stack/sheet)) // To avoid materials dupe glitches
var/obj/item/new_item_item = new_item
new_item_item.update_materials_coeff(coeff)
- if(being_built.locked)
+
+ if(locked)
var/obj/item/storage/lockbox/research/L = new/obj/item/storage/lockbox/research(machine.loc)
new_item.forceMove(L)
L.name += " ([new_item.name])"
L.origin_tech = new_item.origin_tech
L.req_access = being_built.access_requirement
+
var/list/lockbox_access
for(var/A in L.req_access)
lockbox_access += "[get_access_desc(A)] "
+
L.desc = "A locked box. It is locked to [lockbox_access]access."
+
else
new_item.loc = machine.loc
+
machine.busy = FALSE
clear_wait_message()
SStgui.update_uis(src)
+
/obj/machinery/computer/rdconsole/ui_act(action, list/params)
if(..())
return
@@ -967,7 +978,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/core
name = "core R&D console"
- desc = "A console used to interface with R&D tools."
+ desc = "Консоль, используемая для взаимодействия с инструментами НИО."
id = 1
/obj/machinery/computer/rdconsole/core/old_frame
@@ -978,21 +989,21 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/robotics
name = "robotics R&D console"
- desc = "A console used to interface with R&D tools."
+ desc = "Консоль, используемая для взаимодействия с инструментами НИО."
id = 2
req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/rdconsole/robotics
/obj/machinery/computer/rdconsole/experiment
name = "\improper E.X.P.E.R.I-MENTOR R&D console"
- desc = "A console used to interface with R&D tools."
+ desc = "Консоль, используемая для взаимодействия с инструментами НИО."
id = 3
range = 5
circuit = /obj/item/circuitboard/rdconsole/experiment
/obj/machinery/computer/rdconsole/mechanics
name = "mechanics R&D console"
- desc = "A console used to interface with R&D tools."
+ desc = "Консоль, используемая для взаимодействия с инструментами НИО."
id = 4
req_access = list(ACCESS_MECHANIC)
circuit = /obj/item/circuitboard/rdconsole/mechanics
@@ -1004,7 +1015,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/public
name = "public R&D console"
- desc = "A console used to interface with R&D tools."
+ desc = "Консоль, используемая для взаимодействия с инструментами НИО."
id = 5
req_access = list()
circuit = /obj/item/circuitboard/rdconsole/public
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 7ff9b22e299..4ba73ee4d92 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -36,7 +36,7 @@
/obj/machinery/computer/camera_advanced/xenobio
name = "slime management console"
- desc = "A computer used for remotely handling slimes."
+ desc = "Компьютер, используемый для удаленного взаимодействия со слаймами."
networks = list("SS13")
circuit = /obj/item/circuitboard/xenobiology
icon_screen = "slime_comp"
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 513132c4e0b..234355a33fd 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/emergency_shuttle
name = "emergency shuttle console"
- desc = "For shuttle control."
+ desc = "Для управления шаттлом."
icon_screen = "shuttle"
icon_keyboard = "tech_key"
var/auth_need = 3
diff --git a/code/modules/shuttle/ert.dm b/code/modules/shuttle/ert.dm
index e6eea6337da..67777b81968 100644
--- a/code/modules/shuttle/ert.dm
+++ b/code/modules/shuttle/ert.dm
@@ -15,7 +15,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/ert
name = "specops navigation computer"
- desc = "Used to designate a precise transit location for the specops shuttle."
+ desc = "Используется, чтобы указать точное местоположение для отправки ОБР."
icon_screen = "navigation"
icon_keyboard = "med_key"
shuttleId = "specops"
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 9b4f49d0a4d..9870eb2df92 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/camera_advanced/shuttle_docker
name = "navigation computer"
- desc = "Used to designate a precise transit location for a spacecraft."
+ desc = "Используется, чтобы указать точное местоположение для отправки шаттла."
icon_screen = "navigation"
icon_keyboard = "med_key"
jump_action = null
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index f61515183e2..756b2100a86 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -914,7 +914,7 @@
/obj/machinery/computer/shuttle/ruins_transport_shuttle // this shuttle made for station and listening post of ussp since they have lore connection between eachother, btw the shuttle existed before the change but was deleted for some reason.
name = "Transport Shuttle Console"
- desc = "Used to control the Transport Shuttle."
+ desc = "Используется для управления Транспортным шаттлом."
circuit = /obj/item/circuitboard/ruins_transport_shuttle
shuttleId = "ruins_transport_shuttle"
possible_destinations = "ussp_dock;dj_post;sindiecake_dock;ussp_gorky17"
@@ -926,7 +926,7 @@
/obj/machinery/computer/shuttle/ruins_civil_shuttle // made another shuttle, this one will fly between spacebar and twin nexus hotel. just another way to get to it.
name = "Regular Civilian Shuttle Console"
- desc = "Used to control the Regular Civilian Shuttle."
+ desc = "Используется для управления обычным гражданским шаттлом."
circuit = /obj/item/circuitboard/ruins_civil_shuttle
shuttleId = "ruins_civil_shuttle"
possible_destinations = "spacebar;spacehotelv1;ntstation"
@@ -934,20 +934,20 @@
/obj/machinery/computer/shuttle/white_ship
name = "White Ship Console"
- desc = "Used to control the White Ship."
+ desc = "Используется для управления Белым кораблём."
circuit = /obj/item/circuitboard/white_ship
shuttleId = "whiteship"
possible_destinations = null // Set at runtime
/obj/machinery/computer/shuttle/engineering
name = "Engineering Shuttle Console"
- desc = "Used to call and send the engineering shuttle."
+ desc = "Используется для вызова и отправки инженерного шаттла."
shuttleId = "engineering"
possible_destinations = "engineering_home;engineering_away"
/obj/machinery/computer/shuttle/science
name = "Science Shuttle Console"
- desc = "Used to call and send the science shuttle."
+ desc = "Используется для вызова и отправки научного шаттла."
shuttleId = "science"
possible_destinations = "science_home;science_away"
@@ -960,7 +960,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/admin
name = "Admin shuttle navigation computer"
- desc = "Used to designate a precise transit location for the admin shuttle."
+ desc = "Используется, чтобы указать точное местоположение для отправки админского шаттла."
icon_screen = "navigation"
icon_keyboard = "med_key"
shuttleId = "admin"
@@ -987,7 +987,7 @@
/obj/machinery/computer/shuttle/golem_ship
name = "Golem Ship Console"
- desc = "Used to control the Golem Ship."
+ desc = "Используется для управления шаттлом големов."
circuit = /obj/item/circuitboard/shuttle/golem_ship
shuttleId = "freegolem"
possible_destinations = "freegolem_lavaland;freegolem_space;freegolem_ussp"
@@ -1000,7 +1000,7 @@
/obj/machinery/computer/shuttle/golem_ship/recall
name = "golem ship recall terminal"
- desc = "Used to recall the Golem Ship."
+ desc = "Используется для отзыва шаттла големов."
possible_destinations = "freegolem_lavaland"
resistance_flags = INDESTRUCTIBLE
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 8d4c3a52db3..c0a515b3646 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -375,7 +375,7 @@
**************************/
/obj/machinery/computer/supplycomp
name = "Supply Shuttle Console"
- desc = "Used to order supplies."
+ desc = "Используется для оформления заказов."
icon_screen = "supply"
req_access = list(ACCESS_CARGO)
circuit = /obj/item/circuitboard/supplycomp
@@ -388,13 +388,24 @@
/obj/machinery/computer/supplycomp/public
name = "Supply Ordering Console"
- desc = "Used to order supplies from cargo staff."
+ desc = "Используется для оформления заказов. Предназначено для общего пользования."
icon = 'icons/obj/machines/computer.dmi'
icon_screen = "request"
circuit = /obj/item/circuitboard/ordercomp
req_access = list()
is_public = TRUE
+
+/obj/machinery/computer/supplycomp/Initialize(mapload, obj/structure/computerframe/frame)
+ . = ..()
+
+ var/obj/item/circuitboard/supplycomp/my_circuit = src.frame.circuit
+ if(!istype(my_circuit))
+ return
+
+ can_order_contraband = my_circuit.contraband_enabled
+
+
/obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob)
return attack_hand(user)
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
index 340438298a2..45084907cf7 100644
--- a/code/modules/shuttle/syndicate.dm
+++ b/code/modules/shuttle/syndicate.dm
@@ -65,7 +65,7 @@
/obj/machinery/computer/shuttle/sst
name = "Syndicate Strike Team Shuttle Console"
- desc = "Used to call and send the SST shuttle."
+ desc = "Используется для вызова и отправки шаттла Ударного Отряда Синдиката."
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(ACCESS_SYNDICATE)
@@ -76,7 +76,7 @@
/obj/machinery/computer/shuttle/sit
name = "Syndicate Infiltration Team Shuttle Console"
- desc = "Used to call and send the SIT shuttle."
+ desc = "Используется для вызова и отправки шаттла Диверсионного Отряда Синдиката."
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
req_access = list(ACCESS_SYNDICATE)
@@ -87,7 +87,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate
name = "syndicate shuttle navigation computer"
- desc = "Used to designate a precise transit location for the syndicate shuttle."
+ desc = "Используется, чтобы указать точное местоположение для отправки шаттла синдиката."
icon_screen = "syndinavigation"
icon_keyboard = "syndie_key"
shuttleId = "syndicate"
@@ -107,7 +107,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sst
name = "SST shuttle navigation computer"
- desc = "Used to designate a precise transit location for the SST shuttle."
+ desc = "Используется, чтобы указать точное местоположение для отправки шаттла Ударного Отряда Синдиката."
shuttleId = "sst"
shuttlePortId = "sst_custom"
bubble_icon = "syndibot"
@@ -118,7 +118,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/sit
name = "SIT shuttle navigation computer"
- desc = "Used to designate a precise transit location for the SIT shuttle."
+ desc = "Используется, чтобы указать точное местоположение для отправки шаттла Диверсионного Отряда Синдиката."
shuttleId = "sit"
shuttlePortId = "sit_custom"
bubble_icon = "syndibot"
diff --git a/code/modules/shuttle/vox.dm b/code/modules/shuttle/vox.dm
index 7540725fcdb..031e1988ca4 100644
--- a/code/modules/shuttle/vox.dm
+++ b/code/modules/shuttle/vox.dm
@@ -8,7 +8,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/vox
name = "skipjack navigation computer"
- desc = "Used to designate a precise transit location for the skipjack."
+ desc = "Используется, чтобы указать точное местоположение для отправки Скипджека."
icon_screen = "navigation"
icon_keyboard = "med_key"
shuttleId = "skipjack"
diff --git a/code/modules/space_management/zlevel_manager.dm b/code/modules/space_management/zlevel_manager.dm
index 3cf8b7b3a4f..6d87270a74e 100644
--- a/code/modules/space_management/zlevel_manager.dm
+++ b/code/modules/space_management/zlevel_manager.dm
@@ -43,15 +43,10 @@ GLOBAL_DATUM_INIT(space_manager, /datum/zlev_manager, new())
/datum/zlev_manager/proc/get_zlev(z)
- if(!("[z]" in z_list))
- log_runtime(EXCEPTION("Unmanaged z level: '[z]'"))
- else
- return z_list["[z]"]
+ return z_list["[z]"] == null ? log_runtime(EXCEPTION("Unmanaged z level: '[z]'")) : z_list["[z]"]
/datum/zlev_manager/proc/get_zlev_by_name(A)
- if(!(A in levels_by_name))
- log_runtime(EXCEPTION("Non-existent z level: '[A]'"))
- return levels_by_name[A]
+ return levels_by_name[A] == null ? log_runtime(EXCEPTION("Non-existent z level: '[A]'")) : levels_by_name[A]
/*
* "Dirt" management
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 2419f889047..9e5855e8de9 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -601,7 +601,7 @@
equipment_system.vars[slot] = null
-/obj/spacepod/hear_talk/hear_talk(mob/M, list/message_pieces)
+/obj/spacepod/hear_talk(mob/M, list/message_pieces)
cargo_hold.hear_talk(M, message_pieces)
..()
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index fab5b28c908..311be85a546 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -341,7 +341,7 @@
continue
var/new_limb_type = organ_data["path"]
- var/obj/item/organ/external/new_limb = new new_limb_type(holder = target, special = ORGAN_MANIPULATION_DEFAULT)
+ var/obj/item/organ/external/new_limb = new new_limb_type(target, ORGAN_MANIPULATION_DEFAULT)
new_limb.robotize(company = L.model_info)
if(L.sabotaged)
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 59373e06756..39475908614 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -50,13 +50,14 @@
var/hidden_pain = FALSE
-/obj/item/organ/New(mob/living/carbon/human/holder)
- ..(holder)
+/obj/item/organ/Initialize(mapload)
+ . = ..()
if(!max_damage)
max_damage = min_broken_damage * 2
- if(ishuman(holder))
+ if(ishuman(loc))
+ var/mob/living/carbon/human/holder = loc
update_DNA(holder.dna)
return
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 20a2fb27128..4a30d054cd2 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -105,15 +105,16 @@
light_on = FALSE
-/obj/item/organ/external/New(mob/living/carbon/holder, special = ORGAN_MANIPULATION_NOEFFECT)
- ..()
+/obj/item/organ/external/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
if(dna?.species)
icobase = dna.species.icobase
deform = dna.species.deform
- if(ishuman(holder))
- replaced(holder, special)
- sync_colour_to_human(holder)
+
+ if(ishuman(loc))
+ replaced(loc, special)
+ sync_colour_to_human(loc)
properly_attached = TRUE
if(is_robotic())
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index e17da61196f..08ca28a9282 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -12,11 +12,12 @@
light_on = FALSE
-/obj/item/organ/internal/New(mob/living/carbon/holder)
- ..()
-
- if(istype(holder))
- insert(holder)
+/obj/item/organ/internal/Initialize(mapload)
+ . = ..()
+
+ if(iscarbon(loc))
+ insert(loc)
+
if(species_type == /datum/species/diona)
AddComponent(/datum/component/diona_internals)
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index aa7ab941793..d9dfe52dbde 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -10,8 +10,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/head/ipc/New()
- ..()
+/obj/item/organ/external/head/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/chest/ipc
@@ -22,8 +23,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/chest/ipc/New()
- ..()
+/obj/item/organ/external/chest/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/groin/ipc
@@ -34,8 +36,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/groin/ipc/New()
- ..()
+/obj/item/organ/external/groin/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/arm/ipc
@@ -46,8 +49,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/arm/ipc/New()
- ..()
+/obj/item/organ/external/arm/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/arm/right/ipc
@@ -56,8 +60,9 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
-/obj/item/organ/external/arm/right/ipc/New()
- ..()
+/obj/item/organ/external/arm/right/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/leg/ipc
@@ -68,8 +73,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/leg/ipc/New()
- ..()
+/obj/item/organ/external/leg/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/leg/right/ipc
@@ -78,8 +84,9 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
-/obj/item/organ/external/leg/right/ipc/New()
- ..()
+/obj/item/organ/external/leg/right/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/foot/ipc
@@ -90,8 +97,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/foot/ipc/New()
- ..()
+/obj/item/organ/external/foot/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/foot/right/ipc
@@ -100,8 +108,9 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
-/obj/item/organ/external/foot/right/ipc/New()
- ..()
+/obj/item/organ/external/foot/right/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/hand/ipc
@@ -112,8 +121,9 @@
pickup_sound = 'sound/items/handling/component_pickup.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
-/obj/item/organ/external/hand/ipc/New()
- ..()
+/obj/item/organ/external/hand/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/external/hand/right/ipc
@@ -122,8 +132,9 @@
status = ORGAN_ROBOT
emp_resistant = TRUE
-/obj/item/organ/external/hand/right/ipc/New()
- ..()
+/obj/item/organ/external/hand/right/ipc/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
robotize(company = "Morpheus Cyberkinetics")
/obj/item/organ/internal/cell
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index d0971da1aca..27d9ff57e74 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -486,9 +486,10 @@
var/list/m_colours = list("tail" = "#000000")
s_col = "#000000"
-/obj/item/organ/external/tail/New(mob/living/carbon/holder)
- ..()
- if(!holder)
+/obj/item/organ/external/tail/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
+ if(!ishuman(loc))
var/icon/tempicon = new/icon("icon" = force_icon, "icon_state" = icon_name)
var/icon/tempicon2 = new/icon(tempicon,dir=NORTH)
tempicon2.Flip(SOUTH)
@@ -548,9 +549,10 @@
var/list/m_colours = list("wing" = "#000000")
s_col = "#000000"
-/obj/item/organ/external/wing/New(mob/living/carbon/holder)
- ..()
- if(!holder)
+/obj/item/organ/external/wing/Initialize(mapload, special = ORGAN_MANIPULATION_NOEFFECT)
+ . = ..()
+
+ if(!ishuman(loc))
var/icon/tempicon = new/icon("icon" = force_icon, "icon_state" = icon_name)
var/icon/tempicon2 = new/icon(tempicon,dir=NORTH)
tempicon2.Flip(SOUTH)
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 3827cb89721..83b5c23b8f7 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -163,20 +163,20 @@
hitsound = 'sound/weapons/sear.ogg'
/obj/item/scalpel/laser/laser1 //lasers also count as catuarys
- name = "laser scalpel"
- desc = "A scalpel augmented with a directed laser. This one looks basic and could be improved."
+ name = "Basic Laser Scalpel"
+ desc = "Скальпель, дополненный направленным лазером. Может быть усовершенствован."
icon_state = "scalpel_laser1_on"
toolspeed = 0.8
/obj/item/scalpel/laser/laser2
- name = "laser scalpel"
- desc = "A scalpel augmented with a directed laser. This one looks somewhat advanced."
+ name = "Improved Laser Scalpel"
+ desc = "Скальпель, дополненный направленным лазером. Усовершенствованная версия лазерного скальпеля."
icon_state = "scalpel_laser2_on"
toolspeed = 0.6
/obj/item/scalpel/laser/laser3
- name = "laser scalpel"
- desc = "A scalpel augmented with a directed laser. This one looks to be the pinnacle of precision energy cutlery!"
+ name = "Advanced Laser Scalpel"
+ desc = "Скальпель, дополненный направленным лазером. Высокоточная, модернизированная версия лазерного скальпеля."
icon_state = "scalpel_laser3_on"
toolspeed = 0.4
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index b963c8f845e..15aa2b540b0 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -3,7 +3,7 @@
name = "telepad"
desc = "A bluespace telepad used for teleporting objects to and from a location."
icon = 'icons/obj/telescience.dmi'
- icon_state = "pad-idle"
+ icon_state = "pad"
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 200
@@ -49,7 +49,7 @@
/obj/machinery/telepad/screwdriver_act(mob/user, obj/item/I)
. = TRUE
- default_deconstruction_screwdriver(user, "pad-idle-o", "pad-idle", I)
+ default_deconstruction_screwdriver(user, "pad-o", initial(icon_state), I)
/obj/machinery/telepad/multitool_act(mob/user, obj/item/I)
if(!panel_open)
@@ -71,7 +71,7 @@
name = "cargo telepad"
desc = "A telepad used by the Rapid Crate Sender."
icon = 'icons/obj/telescience.dmi'
- icon_state = "pad-idle"
+ icon_state = "pad"
anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 20
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index ede7014d0c6..e2def8c06ab 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/telescience
name = "telepad control console"
- desc = "Used to teleport objects to and from the telescience telepad."
+ desc = "Используется для телепортации объектов на телепад и обратно."
icon_keyboard = "telesci_key"
icon_screen = "telesci"
circuit = /obj/item/circuitboard/telesci_console
@@ -211,7 +211,7 @@
var/turf/target = locate(trueX, trueY, z_co)
last_target = target
var/area/A = get_area(target)
- flick("pad-beam", telepad)
+ flick("[initial(telepad.icon_state)]-beam", telepad)
if(spawn_time > 15) // 1.5 seconds
playsound(telepad.loc, 'sound/weapons/flash.ogg', 25, 1)
@@ -252,7 +252,7 @@
source = dest
dest = target
- flick("pad-beam", telepad)
+ flick("[initial(telepad.icon_state)]-beam", telepad)
playsound(telepad.loc, 'sound/weapons/emitter2.ogg', 50, TRUE)
for(var/atom/movable/ROI in source)
// if is anchored, don't let through
diff --git a/code/modules/tgui/states/range.dm b/code/modules/tgui/states/range.dm
new file mode 100644
index 00000000000..842509c5eaa
--- /dev/null
+++ b/code/modules/tgui/states/range.dm
@@ -0,0 +1,11 @@
+GLOBAL_DATUM_INIT(range_state, /datum/ui_state/range_state, new)
+
+/datum/ui_state/range_state/can_use_topic(src_object, mob/user)
+ var/dist = get_dist(src_object, user)
+ if(dist <= 1)
+ return UI_INTERACTIVE
+
+ else if(dist <= 6)
+ return UI_UPDATE
+
+ return UI_CLOSE
diff --git a/code/modules/w_examine/descriptions/medical.dm b/code/modules/w_examine/descriptions/medical.dm
index 728a5f72c61..a85f73ef6bb 100644
--- a/code/modules/w_examine/descriptions/medical.dm
+++ b/code/modules/w_examine/descriptions/medical.dm
@@ -27,7 +27,7 @@
description_info = "Click your target with Grab intent, then click on the table with an empty hand, to place them on it."
/obj/machinery/computer/operating
- description_info = "This console gives information on the status of the patient on the adjacent operating table, notably their consciousness."
+ description_info = "Эта консоль выдает информацию о состоянии пациента, лежащего на соседнем операционном столе, в частности о его сознании."
/obj/machinery/sleeper
description_info = "The sleeper allows you to clean the blood by means of dialysis, and to administer medication in a controlled environment.
\
diff --git a/config/example/config.txt b/config/example/config.txt
index e40ed4fc4a9..3c2fab540af 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -388,9 +388,6 @@ SOCKET_TALK 0
## How long the delay is before the Away Mission gate opens. Default is half an hour.
GATEWAY_DELAY 6000
-## Remove the # to give assistants maint access.
-ASSISTANT_MAINT
-
## Remove the # to enable assistant limiting.
ASSISTANT_LIMIT
@@ -473,18 +470,6 @@ PLAYER_REROUTE_CAP 0
## Server to reroute to
#TUTORIAL_SERVER_URL byond://example.org:1111
-## Disable the loading of away missions
-#DISABLE_AWAY_MISSIONS
-
-## Disable the loading of space ruins
-#DISABLE_SPACE_RUINS
-
-## Minimum number of space ruins levels to generate
-EXTRA_SPACE_RUIN_LEVELS_MIN 4
-
-## Maximum number of space ruins levels to generate
-EXTRA_SPACE_RUIN_LEVELS_MAX 8
-
## Uncomment to disable the OOC/LOOC channel by default.
#DISABLE_OOC
@@ -648,7 +633,6 @@ TOPIC_FILTERING_WHITELIST 127.0.0.1
# Number of players required for automatic gamemode change to extended. Doesn't work if set to zero or commented
#AUTO_EXTENDED_PLAYERS_NUM 10
-
## CPU Affinity for FFmpeg. Check out taskset man page.
## Example valid values: "0-3" or "1,4-7"
#FFMPEG_CPUAFFINITY 0-3
@@ -666,21 +650,9 @@ MAP_ROTATE none
## notriples - current map can't be selected as next if played twice in a row
MAP_VOTE_MODE all
-## Default server map
-DEFAULT_MAP /datum/map/cyberiad
-
-## Override server map by specified, uncomment to apply
-# OVERRIDE_MAP /datum/map/delta
-
## Enable animations on item pickup and drop down
# ITEM_ANIMATIONS_ENABLED
-## Disable the loading of "Taipan"
-# DISABLE_TAIPAN
-
-## Disable the loading of Lavaland
-# DISABLE_LAVALAND
-
## If the number of players is more or same than this, then we apply the highpop jobs config.
JOBS_HIGH_POP_MODE_AMOUNT 80
@@ -733,3 +705,38 @@ CACHE_ASSETS 0
## Enable the replay demo recording subsystem
#DEMOS_ENABLED
+
+### INITIALIZATION SETTINGS ###
+## This section contains settings directly affecting initializing progress. Uncomment these to make your world load faster.
+
+## Loads only space without anything in station sector. Still makes landmarks for spawnpoints, though.
+#LOAD_NO_STATION
+
+## Enables loading titlescreen only after master has been loaded. Recommended to be used on local server for faster loading.
+#ENABLE_TITLESCREEN_LATELOAD
+
+## Disable the loading of "Taipan"
+#DISABLE_TAIPAN
+
+## Disable the loading of Lavaland
+#DISABLE_LAVALAND
+
+## Disable the loading of away missions
+#DISABLE_AWAY_MISSIONS
+
+## Disable the loading of space ruins
+#DISABLE_SPACE_RUINS
+
+## Default server map
+DEFAULT_MAP /datum/map/cyberiad
+
+## Override server map by specified, uncomment to apply
+# OVERRIDE_MAP /datum/map/delta
+
+## Minimum number of space ruins levels to generate
+EXTRA_SPACE_RUIN_LEVELS_MIN 4
+
+## Maximum number of space ruins levels to generate
+EXTRA_SPACE_RUIN_LEVELS_MAX 8
+
+### INITIALIZATION SETTINGS END ###
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index 694667be1c8..f51cc549c9e 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -20,11 +20,17 @@
- bugfix: Cult fixes (#6090)
- bugfix: dna vault hotfix (#6122)
'2024-11-04':
+ Antoonij:
+ - add: ASHIE UPDATE (#5875)
Daeberdir:
- bugfix: Incorrect `mechanized` limb attaching. (#6125)
- bugfix: Light fixture attach_chain blocks. (#6124)
- bugfix: Fixed phazon noclip on teleport forbidden areas (#6121)
- bugfix: Correct input target for `mindscan`. (#6120)
+ NightDawnFox:
+ - add: a lot of roboquest tweaks. (#5961)
+ NoName:
+ - bugfix: Earings in loadout (#6129)
PiroMage:
- bugfix: 'Nova Station #12 Patch (#6115)'
- bugfix: Conveyor Belt and Disposal Outlet on Cyberiad & Celestation. (#6109)
@@ -34,3 +40,66 @@
- add: CE toolbet now can hold RCD and one more item (#6048)
Valtor:
- add: species age restrictions (#6101)
+ Vladisvell:
+ - bugfix: added failsafe check for elite fauna and chasms (#6126)
+ - server: Updated testmerge workflow (#6127)
+'2024-11-05':
+ Dictor:
+ - add: Entertainment monitor (#5900)
+ Explosi00N:
+ - server: Перевод лута с тендрилов Лаваленда (#6132)
+ LiquidPotroh:
+ - bugfix: Xenomorph fixes (#6110)
+ NightDawnFox:
+ - del: unathi rumble is gone (#6030)
+ - add: advanced laser & alien surgery kits (#6057)
+ Sheya:
+ - add: fishing rod is now craftable in R&D (#6045)
+ - add: Lockboxes on Taipan are no longer created in protholates and exosuit fabricators
+ (#6049)
+ Vladisvell:
+ - del: Перевод лута с тендрилов Лаваленда" (#6133)
+ github-actions[bot]:
+ - server: Automatic NanoMap Update (#6025)
+ littleboobs:
+ - qol: DNA effects translation (#6114)
+'2024-11-06':
+ Antoonij:
+ - bugfix: ash walker rituals fix (#6138)
+ - bugfix: some rituals fix (#6140)
+ LiquidPotroh:
+ - bugfix: Xeno cant evolve to queen (#6136)
+ PlayerUnknown14:
+ - imageadd: Riot shield - new sprites (#6095)
+ - bugfix: RD doll now works properly (#6106)
+ Vladisvell:
+ - bugfix: Fixed headphones not unable to play songs (#6139)
+ - bugfix: Wooden wall creation fix (#6141)
+ - bugfix: Syndicate turrets are now dense (#6142)
+ userbaza:
+ - add: cloth footwraps now paintable, craftable and edible (#6042)
+'2024-11-07':
+ Anorak2020:
+ - add: vampire sucking effects (#6029)
+ KefirTT:
+ - bugfix: singularity hammer no longer pulling ghosts (#6143)
+'2024-11-09':
+ Vitalya:
+ - bugfix: Wryn hair color change (#6152)
+ Vladisvell:
+ - bugfix: Removes density on syndicate turret upon destruction (#6146)
+ - add: Titlescreen optimization for dreamseeker debug mode (#6148)
+ - bugfix: Setups Malfunctioning AI as a special role to prevent double antaging
+ (#6151)
+'2024-11-11':
+ Den109G:
+ - bugfix: Now clock-structure can disguise (#6156)
+ Mahimka42:
+ - add: New robust security backpack (#6135)
+ - tweak: 30 bullets instead 20 in 10mm ammo box. (#6163)
+ PlayerUnknown14:
+ - add: warden got more access (#6157)
+ - add: Security tactical flashlight (#5948)
+ - balance: maintenance tunnels access for everyone (#6158)
+ Vitalya:
+ - imageadd: New sprites for some Wryn masks (#6144)
diff --git a/icons/_nanomaps/Nova_nanomap_z1.png b/icons/_nanomaps/Nova_nanomap_z1.png
index 227991edc30..e3b86ddbadf 100644
Binary files a/icons/_nanomaps/Nova_nanomap_z1.png and b/icons/_nanomaps/Nova_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Nova_nanomap_z2.png b/icons/_nanomaps/Nova_nanomap_z2.png
index 80723ffdcfc..5edd5a29f1b 100644
Binary files a/icons/_nanomaps/Nova_nanomap_z2.png and b/icons/_nanomaps/Nova_nanomap_z2.png differ
diff --git a/icons/effects/ashwalker_rune.dmi b/icons/effects/ashwalker_rune.dmi
new file mode 100644
index 00000000000..99c80693443
Binary files /dev/null and b/icons/effects/ashwalker_rune.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 52db83d1d47..90f04c72f47 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi
index 3e55861f85f..9ca38ef1ffc 100644
Binary files a/icons/mob/clothing/ears.dmi and b/icons/mob/clothing/ears.dmi differ
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
index a81bb67f4cc..8e4c4ee2408 100644
Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 6ad38455ad3..601e7162ee6 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index a4ce834cfae..f23e7b7b571 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 01610a5ad16..6b9d1561c55 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi
index 60a461bc9f1..13d6783d349 100644
Binary files a/icons/mob/clothing/species/drask/eyes.dmi and b/icons/mob/clothing/species/drask/eyes.dmi differ
diff --git a/icons/mob/clothing/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi
index db26ee4b53f..660fb46bf32 100644
Binary files a/icons/mob/clothing/species/drask/mask.dmi and b/icons/mob/clothing/species/drask/mask.dmi differ
diff --git a/icons/mob/clothing/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi
index 0587606747c..1f6fdff6a7d 100644
Binary files a/icons/mob/clothing/species/drask/uniform.dmi and b/icons/mob/clothing/species/drask/uniform.dmi differ
diff --git a/icons/mob/clothing/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi
index 1ad5b9b9dcd..d20e8ac2174 100644
Binary files a/icons/mob/clothing/species/grey/back.dmi and b/icons/mob/clothing/species/grey/back.dmi differ
diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi
index 06aff6f9fc6..4a81420c5f8 100644
Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ
diff --git a/icons/mob/clothing/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi
index 82c9d36ff3b..d37f75a4188 100644
Binary files a/icons/mob/clothing/species/grey/mask.dmi and b/icons/mob/clothing/species/grey/mask.dmi differ
diff --git a/icons/mob/clothing/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi
index 11d5f99cc0c..658469a9729 100644
Binary files a/icons/mob/clothing/species/grey/uniform.dmi and b/icons/mob/clothing/species/grey/uniform.dmi differ
diff --git a/icons/mob/clothing/species/kidan/mask.dmi b/icons/mob/clothing/species/kidan/mask.dmi
index 84a66775738..7033701c293 100644
Binary files a/icons/mob/clothing/species/kidan/mask.dmi and b/icons/mob/clothing/species/kidan/mask.dmi differ
diff --git a/icons/mob/clothing/species/kidan/uniform.dmi b/icons/mob/clothing/species/kidan/uniform.dmi
index 72b43ba157c..097f2317a1f 100644
Binary files a/icons/mob/clothing/species/kidan/uniform.dmi and b/icons/mob/clothing/species/kidan/uniform.dmi differ
diff --git a/icons/mob/clothing/species/monkey/ears.dmi b/icons/mob/clothing/species/monkey/ears.dmi
index b55a433dfb3..fe201b6c978 100644
Binary files a/icons/mob/clothing/species/monkey/ears.dmi and b/icons/mob/clothing/species/monkey/ears.dmi differ
diff --git a/icons/mob/clothing/species/monkey/eyes.dmi b/icons/mob/clothing/species/monkey/eyes.dmi
index e93142f8d2d..c9fcd0ea96b 100644
Binary files a/icons/mob/clothing/species/monkey/eyes.dmi and b/icons/mob/clothing/species/monkey/eyes.dmi differ
diff --git a/icons/mob/clothing/species/monkey/head.dmi b/icons/mob/clothing/species/monkey/head.dmi
index e8c793b66d4..2e8e4278b5c 100644
Binary files a/icons/mob/clothing/species/monkey/head.dmi and b/icons/mob/clothing/species/monkey/head.dmi differ
diff --git a/icons/mob/clothing/species/monkey/mask.dmi b/icons/mob/clothing/species/monkey/mask.dmi
index c37c41b35a1..86a0dfe6782 100644
Binary files a/icons/mob/clothing/species/monkey/mask.dmi and b/icons/mob/clothing/species/monkey/mask.dmi differ
diff --git a/icons/mob/clothing/species/monkey/uniform.dmi b/icons/mob/clothing/species/monkey/uniform.dmi
index 8a5662bdb82..92b316f6b58 100644
Binary files a/icons/mob/clothing/species/monkey/uniform.dmi and b/icons/mob/clothing/species/monkey/uniform.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi
index 90b55d2fb79..c49c4cad2e2 100644
Binary files a/icons/mob/clothing/species/tajaran/mask.dmi and b/icons/mob/clothing/species/tajaran/mask.dmi differ
diff --git a/icons/mob/clothing/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi
index 9802caa3ac1..30603327337 100644
Binary files a/icons/mob/clothing/species/unathi/mask.dmi and b/icons/mob/clothing/species/unathi/mask.dmi differ
diff --git a/icons/mob/clothing/species/unathi/shoes.dmi b/icons/mob/clothing/species/unathi/shoes.dmi
index a6fdd4c20f4..2d428a7d85b 100644
Binary files a/icons/mob/clothing/species/unathi/shoes.dmi and b/icons/mob/clothing/species/unathi/shoes.dmi differ
diff --git a/icons/mob/clothing/species/unathi/uniform.dmi b/icons/mob/clothing/species/unathi/uniform.dmi
index 517883bb747..1025d3ad9b4 100644
Binary files a/icons/mob/clothing/species/unathi/uniform.dmi and b/icons/mob/clothing/species/unathi/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi
index 8274c45cb9c..8d1f48dd247 100644
Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ
diff --git a/icons/mob/clothing/species/vox/ears.dmi b/icons/mob/clothing/species/vox/ears.dmi
index 5168e567419..b19672c81b2 100644
Binary files a/icons/mob/clothing/species/vox/ears.dmi and b/icons/mob/clothing/species/vox/ears.dmi differ
diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi
index ef2956b1e80..6eca2223299 100644
Binary files a/icons/mob/clothing/species/vox/eyes.dmi and b/icons/mob/clothing/species/vox/eyes.dmi differ
diff --git a/icons/mob/clothing/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi
index 173b80e41df..c9b3313b256 100644
Binary files a/icons/mob/clothing/species/vox/mask.dmi and b/icons/mob/clothing/species/vox/mask.dmi differ
diff --git a/icons/mob/clothing/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi
index 80fa00c2d0b..b14c90995d9 100644
Binary files a/icons/mob/clothing/species/vox/uniform.dmi and b/icons/mob/clothing/species/vox/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi
index 802d3b337a5..47d16389a72 100644
Binary files a/icons/mob/clothing/species/vulpkanin/mask.dmi and b/icons/mob/clothing/species/vulpkanin/mask.dmi differ
diff --git a/icons/mob/clothing/species/wryn/mask.dmi b/icons/mob/clothing/species/wryn/mask.dmi
index 5e72a8730da..bfd77b02ea5 100644
Binary files a/icons/mob/clothing/species/wryn/mask.dmi and b/icons/mob/clothing/species/wryn/mask.dmi differ
diff --git a/icons/mob/clothing/species/wryn/uniform.dmi b/icons/mob/clothing/species/wryn/uniform.dmi
index f676a5dbee3..2434e25e4ba 100644
Binary files a/icons/mob/clothing/species/wryn/uniform.dmi and b/icons/mob/clothing/species/wryn/uniform.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index 10209a3ca4f..541ef5f85e6 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index f9f9153edb0..b7af09ade06 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 11b0fac7bfa..10fc756e2aa 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 79b2b01a901..5f35327a3f3 100755
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 687862eca7f..004891ea390 100755
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/mobs_lefthand.dmi b/icons/mob/inhands/mobs_lefthand.dmi
index d3703b56297..efc6a7c8aaf 100644
Binary files a/icons/mob/inhands/mobs_lefthand.dmi and b/icons/mob/inhands/mobs_lefthand.dmi differ
diff --git a/icons/mob/inhands/mobs_righthand.dmi b/icons/mob/inhands/mobs_righthand.dmi
index be4a567b689..16df4461689 100644
Binary files a/icons/mob/inhands/mobs_righthand.dmi and b/icons/mob/inhands/mobs_righthand.dmi differ
diff --git a/icons/mob/sprite_accessories/human/human_hair.dmi b/icons/mob/sprite_accessories/human/human_hair.dmi
index 176ea1ab05e..682ec55eca8 100644
Binary files a/icons/mob/sprite_accessories/human/human_hair.dmi and b/icons/mob/sprite_accessories/human/human_hair.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 174e2a4ad1c..964c2b27b8e 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 93a943f6ca5..eea75185ce8 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 2d41b6601c4..c7a07b5ee80 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index ea0c5eef85a..2f796a0ca27 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index ba6ae22135e..5b7418245a6 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index a6072426b39..2552e6f9aae 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index bb24519cbf5..0d3952efe29 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index f97f776b592..b9cee7e6acf 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index 178610b7424..4fc1f5cba29 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 8b853ba2bc8..ceb86c0667b 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machineprototype.dmi b/icons/obj/machineprototype.dmi
index f5312bdba60..22dd23fcf53 100644
Binary files a/icons/obj/machineprototype.dmi and b/icons/obj/machineprototype.dmi differ
diff --git a/icons/obj/mecha/mecha.dmi b/icons/obj/mecha/mecha.dmi
index 21e70a9373b..379e9875dea 100644
Binary files a/icons/obj/mecha/mecha.dmi and b/icons/obj/mecha/mecha.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 3d4dea6aac0..f928128df10 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
index 81471202dc2..4f67f950fcd 100644
Binary files a/icons/obj/telescience.dmi and b/icons/obj/telescience.dmi differ
diff --git a/icons/obj/weapons/energy.dmi b/icons/obj/weapons/energy.dmi
index 459a68a74cc..76045167bac 100644
Binary files a/icons/obj/weapons/energy.dmi and b/icons/obj/weapons/energy.dmi differ
diff --git a/paradise.dme b/paradise.dme
index e79b1cd77ea..d07486cf3fa 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -50,7 +50,6 @@
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\configuration.dm"
#include "code\__DEFINES\construction.dm"
-#include "code\__DEFINES\spells.dm"
#include "code\__DEFINES\contractors.dm"
#include "code\__DEFINES\contracts.dm"
#include "code\__DEFINES\cooldowns.dm"
@@ -115,11 +114,12 @@
#include "code\__DEFINES\RCD.dm"
#include "code\__DEFINES\reagents.dm"
#include "code\__DEFINES\request.dm"
+#include "code\__DEFINES\rituals.dm"
#include "code\__DEFINES\role_preferences.dm"
#include "code\__DEFINES\rolebans.dm"
#include "code\__DEFINES\rust_g.dm"
-#include "code\__DEFINES\secret_documents.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
+#include "code\__DEFINES\secret_documents.dm"
#include "code\__DEFINES\sensor_devices.dm"
#include "code\__DEFINES\shuttle.dm"
#include "code\__DEFINES\sibyl.dm"
@@ -129,6 +129,7 @@
#include "code\__DEFINES\span.dm"
#include "code\__DEFINES\speech_channels.dm"
#include "code\__DEFINES\speech_controller.dm"
+#include "code\__DEFINES\spells.dm"
#include "code\__DEFINES\stat.dm"
#include "code\__DEFINES\stat_tracking.dm"
#include "code\__DEFINES\station_goals.dm"
@@ -402,6 +403,7 @@
#include "code\datums\radio.dm"
#include "code\datums\recipe.dm"
#include "code\datums\revision.dm"
+#include "code\datums\rituals.dm"
#include "code\datums\ruins.dm"
#include "code\datums\shuttles.dm"
#include "code\datums\snake_fashion.dm"
@@ -422,16 +424,16 @@
#include "code\datums\cache\powermonitor.dm"
#include "code\datums\changelog\changelog.dm"
#include "code\datums\cinematics\cinematic_datum.dm"
+#include "code\datums\cinematics\kharin_summon.dm"
#include "code\datums\cinematics\malf_doomsday.dm"
#include "code\datums\cinematics\narsie_summon.dm"
-#include "code\datums\cinematics\kharin_summon.dm"
+#include "code\datums\cinematics\nuke_cinematics.dm"
#include "code\datums\cinematics\ratvar_summon.dm"
#include "code\datums\cinematics\reaper_summon.dm"
-#include "code\datums\cinematics\nuke_cinematics.dm"
#include "code\datums\components\_component.dm"
#include "code\datums\components\after_attacks_hub.dm"
-#include "code\datums\components\aura_healing.dm"
#include "code\datums\components\animal_temperature.dm"
+#include "code\datums\components\aura_healing.dm"
#include "code\datums\components\boomerang.dm"
#include "code\datums\components\boss_music.dm"
#include "code\datums\components\caltrop.dm"
@@ -462,6 +464,7 @@
#include "code\datums\components\persistent_overlay.dm"
#include "code\datums\components\proximity_monitor.dm"
#include "code\datums\components\radioactivity.dm"
+#include "code\datums\components\ritual_object.dm"
#include "code\datums\components\shielded.dm"
#include "code\datums\components\slippery.dm"
#include "code\datums\components\spawner.dm"
@@ -664,7 +667,6 @@
#include "code\datums\spells\alien_spells\corrosive_acid_spit.dm"
#include "code\datums\spells\alien_spells\evolve.dm"
#include "code\datums\spells\alien_spells\impregnate.dm"
-#include "code\datums\spells\alien_spells\larva_evolve.dm"
#include "code\datums\spells\alien_spells\lay_alien_eggs.dm"
#include "code\datums\spells\alien_spells\neurotoxin_spit.dm"
#include "code\datums\spells\alien_spells\open_vent_alien.dm"
@@ -3149,6 +3151,7 @@
#include "code\modules\tgui\states\notcontained.dm"
#include "code\modules\tgui\states\observer.dm"
#include "code\modules\tgui\states\physical.dm"
+#include "code\modules\tgui\states\range.dm"
#include "code\modules\tgui\states\self.dm"
#include "code\modules\tgui\states\strippable_state.dm"
#include "code\modules\tgui\states\zlevel.dm"
diff --git a/tgui/packages/tgui/interfaces/BotClean.js b/tgui/packages/tgui/interfaces/BotClean.js
index 7d73bc8e5cf..e43095641e0 100644
--- a/tgui/packages/tgui/interfaces/BotClean.js
+++ b/tgui/packages/tgui/interfaces/BotClean.js
@@ -20,71 +20,74 @@ export const BotClean = (props, context) => {
- Swipe an ID card to {locked ? 'unlock' : 'lock'} this interface.
+ Проведите своей ID-картой, чтобы
+ {locked ? 'разблокировать' : 'заблокировать'} этот интерфейс.
-
+
-
+
-
+
act('autopatrol')}
/>
{!!maintpanel && (
-
- Panel Open!
+
+ Панель открыта
)}
-
+
- {emagged ? 'DISABLED!' : 'Enabled'}
+ {emagged ? 'Отключены' : 'Включены'}
{!!canhack && (
-
+
)}
-
+
act('disableremote')}
/>
-
+
{painame && (
-
+