Skip to content

Commit

Permalink
Merge branch 'master' into translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Legendaxe committed Jun 3, 2024
2 parents aad9674 + c258a1e commit c9f17f0
Show file tree
Hide file tree
Showing 15 changed files with 147 additions and 125 deletions.
4 changes: 2 additions & 2 deletions code/modules/power/engines/supermatter/supermatter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,10 @@
switch(get_status())
if(SUPERMATTER_DELAMINATING)
playsound(src, 'sound/misc/bloblarm.ogg', 100, FALSE, 40, 30, falloff_distance = 10)
GLOB.major_announcement.Announce("ВНИМАНИЕ, АКТИВНАЯ ЗОНА РЕАКТОРА НАХОДИТСЯ В КРИТИЧЕСКОМ СОСТОЯНИИ!", "РЕАКТОР СУПЕРМАТЕРИИ: СОСТОЯНИЕ КРИТИЧЕСКОЕ!", 'modular_ss220/aesthetics_sounds/sound/supermatter/meltdown.ogg') //SS220 EDIT - ADDITION
GLOB.major_announcement.Announce("ВНИМАНИЕ, АКТИВНАЯ ЗОНА РЕАКТОРА НАХОДИТСЯ В КРИТИЧЕСКОМ СОСТОЯНИИ!", "РЕАКТОР СУПЕРМАТЕРИИ: СОСТОЯНИЕ КРИТИЧЕСКОЕ!", 'modular_ss220/aesthetics_sounds/sound/supermatter/meltdown.ogg') // SS220 EDIT - ADDITION
if(SUPERMATTER_EMERGENCY)
playsound(src, 'sound/machines/engine_alert1.ogg', 100, FALSE, 30, 30, falloff_distance = 10)
GLOB.major_announcement.Announce("ВНИМАНИЕ, АКТИВНАЯ ЗОНА РЕАКТОРА НАХОДИТСЯ В СОСТОЯНИИ КРИТИЧЕСКОГО ПЕРЕГРЕВА. ЯДЕРНАЯ КАТАСТРОФА НЕИЗБЕЖНА!", "РЕАКТОР СУПЕРМАТЕРИИ: СОСТОЯНИЕ КРИТИЧЕСКОЕ!", 'modular_ss220/aesthetics_sounds/sound/supermatter/core_overheating.ogg') //SS220 EDIT - ADDITION
GLOB.major_announcement.Announce("ВНИМАНИЕ, АКТИВНАЯ ЗОНА РЕАКТОРА НАХОДИТСЯ В СОСТОЯНИИ КРИТИЧЕСКОГО ПЕРЕГРЕВА. ЯДЕРНАЯ КАТАСТРОФА НЕИЗБЕЖНА!", "РЕАКТОР СУПЕРМАТЕРИИ: СОСТОЯНИЕ КРИТИЧЕСКОЕ!", 'modular_ss220/aesthetics_sounds/sound/supermatter/core_overheating.ogg') // SS220 EDIT - ADDITION
if(SUPERMATTER_DANGER)
playsound(src, 'sound/machines/engine_alert2.ogg', 100, FALSE, 30, 30, falloff_distance = 10)
if(SUPERMATTER_WARNING)
Expand Down
10 changes: 5 additions & 5 deletions modular_ss220/maps220/code/Station/station_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,15 @@
name = "Заброшенное Складское Помещение"
icon_state = "cargobay"

/area/station/supply/expedition/gate
name = "Гейт"

/area/station/public/pool
name = "Бассейн"
icon_state = "dorms"

/area/station/public/vacant_store
name = "Вакантный Офис"
name = "Вакантный Магазин"
icon = 'modular_ss220/maps220/icons/areas.dmi'
icon_state = "vacantstore"

Expand All @@ -65,7 +68,7 @@
icon_state = "kitchen"

/area/station/maintenance/old_detective
name = "Старый офис Детектива"
name = "Старый Офис Детектива"
icon_state = "detective"

/area/station/maintenance/virology_maint
Expand Down Expand Up @@ -97,9 +100,6 @@
name = "Атриум"
icon_state = "bar"

/area/station/supply/expedition/gate
name = "Гейт"

/* CentCom */
/area/centcom/ss220
name = "ЦК"
Expand Down
11 changes: 4 additions & 7 deletions modular_ss220/sm_space_drop/code/paper_sm_info.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// Инструкция пользование системы сброса СМ

/// Инструкция пользование системы сброса СМ
/obj/item/paper/sm_paper
name = "\improper инструкция по использованию СБСКС"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
name = "\proper инструкция по использованию СБСКС"
info = {"<center><h1>Инструкция по использованию Системы Быстрого Сброса Кристалла Суперматерии</h1></center>
<br>1. Ни при каких обстоятельствах не нажимать на кнопку ради проверки ее работоспособности.<br>

Expand All @@ -15,9 +12,9 @@

<br>5. Создание помехи при необходимости сброса кристалла квалифицируется статьей 400 Космического Закона.<br>

<br>Поздравляю! Теперь в случае вероятности взрыва кристалла Супер Материи, вы в состоянии сохранить целостность станции.<br>
<br>Поздравляю! Теперь в случае вероятности взрыва кристалла Суперматерии, вы в состоянии сохранить целостность станции.<br>

<br>ПРИМЕЧАНИЕ: Кнопка сброса СМ находится в его буферной зоне на стене возле правого вента.<br>
<br>ПРИМЕЧАНИЕ: Кнопка сброса СМ находится в его буферной зоне на правой стене.<br>
<hr>
<center><h1><div style='text-align:center;'><img src='ntlogo.png'></h1></center>
"}
97 changes: 0 additions & 97 deletions modular_ss220/sm_space_drop/code/sm_button_NEW.dm

This file was deleted.

117 changes: 117 additions & 0 deletions modular_ss220/sm_space_drop/code/sm_drop_button.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
//////////////////////////////////////
// Кнопка СБСКС //
//////////////////////////////////////
/// Supermatter Drop button
/obj/machinery/driver_button/sm_drop_button
name = "supermatter launch trigger"
desc = "Кнопка экстренного сброс кристалла Суперматерии.\n<font color='red'>ВНИМАНИЕ:</font> Неправомерное использование может привести к тюремному заключению."
icon = 'modular_ss220/sm_space_drop/icons/sm_buttons.dmi'
icon_state = "button"
// We don't want it to be randomly destroyed
max_integrity = 500
armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 10, rad = 100, fire = 90, acid = 70)
id_tag = "SpaceDropSM"
req_access = list(ACCESS_CE)
/// If the safety glass is still in place
var/glass = TRUE
/// If it's already used and launched
var/launched = FALSE
var/obj/machinery/atmospherics/supermatter_crystal/engine/crystal

// In case we're annihilated by a meteor
/obj/machinery/driver_button/sm_drop_button/Destroy()
if(!launched)
launch_sequence()
crystal = null
return ..()

/obj/machinery/driver_button/sm_drop_button/update_icon_state()
if(launched)
icon_state = "[initial(icon_state)]_launched"
else if(!glass)
icon_state = "[initial(icon_state)]_open"
else
icon_state = "[initial(icon_state)]"
..()

/obj/machinery/driver_button/sm_drop_button/examine(mob/user)
. = ..()
if(!glass)
. += span_notice("У [name] разбито защитное стекло.")
if(launched)
. += span_notice("Кнопка медленно мигает, сигнализируя о том, что она была нажата.")

/obj/machinery/driver_button/sm_drop_button/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)

if(stat & (NOPOWER|BROKEN))
return

if(active)
return

add_fingerprint(user)
use_power(5)

if(!allowed(user) && !glass && !launched)
to_chat(user, span_warning("В доступе отказано."))
return

// Already launched
if(launched)
to_chat(user, span_warning("Кнопка уже нажата."))
return

// Glass present
else if(glass)
if(user.a_intent == INTENT_HARM)
user.visible_message(span_warning("[user] разбивает стекло [name]!"), span_warning("Вы разбиваете стекло [name]!"))
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
glass = FALSE
playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, TRUE)
update_icon_state()
else
user.visible_message(span_notice("[user] дружески похлопывает по [name]."), span_notice("Вы дружески похлопываете по [name]."))
playsound(loc, 'sound/effects/glassknock.ogg', 50, TRUE)
to_chat(user, span_warning("Если вы пытаетесь разбить стекло, вам придется ударить по нему сильнее..."))
else
// Must be !glass and !launched and crystal is in emergency state (around 10%)
for(crystal in SSair.atmos_machinery)
if(crystal?.id_tag == id_tag && crystal?.get_integrity() < SUPERMATTER_EMERGENCY)
user.visible_message(span_warning("[user] нажимает кнопку сброса [name]!"), span_warning("Вы нажимаете кнопку сброса!"))
playsound(loc, "modular_ss220/sm_space_drop/sound/button[rand(1, 5)].ogg", 100, TRUE)
visible_message(span_notice("Кнопка громко щелкает."))
launch_sequence()
update_icon_state()
if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
var/area/area = get_area(src)
if(area)
message_admins("Supermatter Crystal has been launched to space by [key_name_admin(user)] [ADMIN_JMP(src)].")
investigate_log("has been launched to space at ([area.name]) by [key_name(user)].", "supermatter")
break
else
playsound(loc, "modular_ss220/sm_space_drop/sound/button[rand(1, 5)].ogg", 100, TRUE)
to_chat(user, span_warning("Система безопасности заблокировала попытку сброса. Кристалл не находится в состоянии расслоения!"))
return

/obj/machinery/driver_button/sm_drop_button/launch_sequence()
if(launched)
return
launched = TRUE
GLOB.major_announcement.Announce("ВНИМАНИЕ, ПРОИЗВОДИТСЯ ЭКСТРЕННЫЙ СБРОС КРИСТАЛЛА!", "РЕАКТОР СУПЕРМАТЕРИИ: ЭКСТРЕННЫЙ СБРОС.", 'sound/effects/engine_alert2.ogg')

for(crystal in SSair.atmos_machinery)
if(crystal?.id_tag == id_tag)
crystal.anchored = FALSE
break

..()

/obj/machinery/driver_button/sm_drop_button/rearm()
active = FALSE

/obj/machinery/driver_button/sm_drop_button/wrench_act()
return

/obj/machinery/driver_button/sm_drop_button/multitool_act()
return
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
/obj/machinery/atmospherics/supermatter_crystal/engine
is_main_engine = TRUE
anchored = TRUE
var/id_tag = "SpaceDropSM"
25 changes: 16 additions & 9 deletions modular_ss220/sm_space_drop/code/sm_mass_driver.dm
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
/obj/machinery/mass_driver/sm_mass_driver
name = "\improper пусковая установка СМ"
desc = "Запускает СМ бороздить просторы космоса."
icon = 'icons/obj/objects.dmi'
icon_state = "mass_driver"
anchored = TRUE
idle_power_consumption = 2
active_power_consumption = 50
name = "supermatter mass driver"
desc = "Запускает кристалл Суперматерии бороздить просторы космоса."
// We don't want it to be randomly destroyed
max_integrity = 500
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF

id_tag = "SpaceDropSM"

/obj/machinery/sm_mass_driver/multitool_act(mob/user, obj/item/I)
return FALSE
// You can't manipulate with mass driver to avoid grief
/obj/machinery/mass_driver/sm_mass_driver/screwdriver_act()
return

/obj/machinery/mass_driver/sm_mass_driver/multitool_act()
return

/obj/machinery/mass_driver/sm_mass_driver/emp_act()
return

/obj/machinery/mass_driver/sm_mass_driver/emag_act()
return
Binary file modified modular_ss220/sm_space_drop/icons/sm_buttons.dmi
Binary file not shown.
6 changes: 3 additions & 3 deletions modular_ss220/sm_space_drop/sm_space_drop.dme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "sm_space_drop.dm"

#include "code/sm_button_NEW.dm"
#include "code/sm_space_drop.dm"
#include "code/sm_mass_driver.dm"
#include "code/paper_sm_info.dm"
#include "code/sm_drop_button.dm"
#include "code/sm_mass_driver.dm"
#include "code/sm_engine.dm"
Binary file removed modular_ss220/sm_space_drop/sound/button.ogg
Binary file not shown.
Binary file modified modular_ss220/sm_space_drop/sound/button1.ogg
Binary file not shown.
Binary file modified modular_ss220/sm_space_drop/sound/button2.ogg
Binary file not shown.
Binary file modified modular_ss220/sm_space_drop/sound/button3.ogg
Binary file not shown.
Binary file modified modular_ss220/sm_space_drop/sound/button4.ogg
Binary file not shown.
Binary file added modular_ss220/sm_space_drop/sound/button5.ogg
Binary file not shown.

0 comments on commit c9f17f0

Please sign in to comment.