Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit e38c83d
Author: PlayerUnknown14 <[email protected]>
Date:   Sat Feb 8 19:36:50 2025 +0700

    Squashed commit of the following:

    commit bc27b9c
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 17:33:40 2025 +0500

        add: Inugami medical gloves (ss220-space#6462)

        * add: Inugami medical gloves

        * Update code/modules/clothing/gloves/color.dm

        Co-authored-by: PlayerUnknown14 <[email protected]>

        * Update code/modules/clothing/gloves/color.dm

        Co-authored-by: PlayerUnknown14 <[email protected]>

        * refator_to_signal

        * Update code/modules/clothing/gloves/color.dm

        * refector_part2

        * Update code/modules/clothing/gloves/color.dm

        * Update code/modules/surgery/surgery.dm

        Co-authored-by: BeebBeebBoob <[email protected]>

        * Update code/modules/surgery/surgery.dm

        Co-authored-by: BeebBeebBoob <[email protected]>

        ---------

        Co-authored-by: PlayerUnknown14 <[email protected]>
        Co-authored-by: BeebBeebBoob <[email protected]>

    commit 2620a91
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 17:32:29 2025 +0500

        refactor: Попытка убрать лаги от бури на Лаве (ss220-space#6536)

        * tweak: Попытка убрать лаги от бури на Лаве

        * fix

        * comment

        ---------

        Co-authored-by: BeebBeebBoob <[email protected]>

    commit 3d18996
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 17:09:48 2025 +0500

        admin: tgui интпуты в админских кнопках + фикс работы кнопок (ss220-space#6530)

        * admin: tgui интпуты в админских кнопках + фикс работы кнопок

        * fix

        * map_fix

    commit 16bd52b
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 16:59:16 2025 +0500

        admin: Две новые кнопки для контроля раунда (ss220-space#6535)

        * admin: Две новые кнопки для контроля раунда

        * Update code/modules/admin/topic.dm

        Co-authored-by: BeebBeebBoob <[email protected]>

        ---------

        Co-authored-by: BeebBeebBoob <[email protected]>

    commit d21a8be
    Author: Andrew455h <[email protected]>
    Date:   Sat Feb 8 13:31:37 2025 +0200

        bugfix: спавн камеры абдукторов на ЦК (ss220-space#6534)

        * camera aiEye network check

        * remove var

    commit 0d1c85c
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 16:29:02 2025 +0500

        bugfix: tgui input text более не обрезает переносы строки в начале ввода (ss220-space#6526)

        * bugfix: tgui input text более не обрезает переносы строки в начале ввода

        * Update code/modules/tgui/tgui_input/text_input.dm

        Co-authored-by: BeebBeebBoob <[email protected]>

        ---------

        Co-authored-by: BeebBeebBoob <[email protected]>

    commit 1af0943
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 16:24:06 2025 +0500

        admin: Возможность отменить сохранение выбранного режима в файл (ss220-space#6525)

    commit 7e98f69
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 16:22:43 2025 +0500

        admin: дни, часы, минуты в бан панели (ss220-space#6524)

    commit d977805
    Author: FlitchTime <[email protected]>
    Date:   Sat Feb 8 14:22:00 2025 +0300

        map: Автолат в рнд для Коробки (ss220-space#6523)

        * Автолат в рнд

        * Шатерсы преОпен

    commit 1a9a92f
    Author: FlitchTime <[email protected]>
    Date:   Sat Feb 8 14:21:16 2025 +0300

        tweak: Добавляем броню кожаным жилетам (ss220-space#6520)

        * Помогаем Шейе

        * Update code/modules/clothing/suits/miscellaneous.dm

        Co-authored-by: Antoonij <[email protected]>

        ---------

        Co-authored-by: Antoonij <[email protected]>

    commit 09d5afd
    Author: FlitchTime <[email protected]>
    Date:   Sat Feb 8 14:20:42 2025 +0300

        tweak: Бога больше не надо кормить после призыва (ss220-space#6518)

        Богу призывается сразу после обеда

    commit 4c99cff
    Author: PlayerUnknown14 <[email protected]>
    Date:   Sat Feb 8 18:13:32 2025 +0700

        bugfix: рабочее переименование объектов с ru_names  (ss220-space#6532)

        тык

    commit 596e747
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 15:55:54 2025 +0500

        bugfix: Исправление ввода чисел в ВВ + Возможность отмены раздачи куклы призракам (ss220-space#6521)

        Co-authored-by: BeebBeebBoob <[email protected]>

    commit 0cb84a5
    Author: dageavtobusnick <[email protected]>
    Date:   Sat Feb 8 15:54:27 2025 +0500

        bugfix: Исправление ошибки при добавлении в VV нового объекта без аргументов (ss220-space#6517)

    commit 5e35d40
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 13:46:34 2025 +0300

        bugfix: Голомап инженерный на Дельте (ss220-space#6516)

    commit 6c5e69d
    Author: TimChi <[email protected]>
    Date:   Sun Feb 2 12:35:40 2025 +0300

        add: Light frame coloring (ss220-space#6381)

        * working properly

        * что за удаление символа переноса строки?!

        * Update lighting.dm

        ---------

        Co-authored-by: BeebBeebBoob <[email protected]>

    commit 8e35d68
    Author: dageavtobusnick <[email protected]>
    Date:   Sun Feb 2 14:34:13 2025 +0500

        admin: Настраиваемый портальный шторм (ss220-space#6496)

        * admin: Настраиваемый портальный шторм

        * fix

        * fix

    commit 45d2197
    Author: dageavtobusnick <[email protected]>
    Date:   Sun Feb 2 14:32:57 2025 +0500

        admin: Изменение доступа админской части консоли коммуникаций + багфикс обр (ss220-space#6501)

        * admin: Изменение доступа админской части консоли коммуникаций + багфикс обр

        * ERT_lock_fix

        * уведомление тоже

    commit db45acd
    Author: dageavtobusnick <[email protected]>
    Date:   Sun Feb 2 14:31:56 2025 +0500

        admin: немного ПОДизации админских кнопок (ss220-space#6503)

        * admin: немного ПОДезации админских кнопок

        * ящик тоже

        * fix

        * style fix

    commit bab8b28
    Author: FlitchTime <[email protected]>
    Date:   Sun Feb 2 12:27:05 2025 +0300

        imageadd: Спрайты в руках для ксено-органов и медицинской одежды (ss220-space#6505)

        * Спрайты орагов и одежды в руках и немного логики для обновления спрайтов в руках

        * Фиксим одежду

        * Меняем спрайты сердец местами

    commit dd10549
    Author: dageavtobusnick <[email protected]>
    Date:   Sun Feb 2 14:24:48 2025 +0500

        experiment: explosions subsystem (ss220-space#6372)

        * experiment: explosions subsystem

        * style fix

        * fix

        * infinity cycle fix

        * experiment: explosions subsystem

        * style fix

        * fix

        * infinity cycle fix

        * node qdels fix

        * no_more_infinity_cycle

        * update

        Добавлена корректная более обработка мультиЗ взрывов, теперь взрыв на разны уровнях происходит в рамках одной обработки, а не как последовательность взрывов на разных уровнях.
        Так же в прок добавлена возможность содавать направленные взрывы, а так же исключать эпицентр из обработки.
        Убрана старая обработка мультиЗ взрывов

    commit bb77a48
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 12:17:58 2025 +0300

        refactor: Метеорные щиты, визуал на голомапе, соединение Z уровней (ss220-space#6513)

        * refactor: Метеорные щиты, визуал на голомапе, соединение Z уровней

        * translation fix

    commit ace94d0
    Author: Vitalya <[email protected]>
    Date:   Sun Feb 2 16:10:27 2025 +0700

        imageadd: Респрайт космических кои (ss220-space#6448)

        * some_koi_resprite

        * koi resprite 2

        * kisik fix

    commit 2333487
    Author: FlitchTime <[email protected]>
    Date:   Sun Feb 2 12:08:11 2025 +0300

        bugfix: Исправил путь до стейтов темплар щита и дарк блессинга (ss220-space#6514)

        Исправил путь до стейтов

    commit 104211c
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 12:07:01 2025 +0300

        bugfix: NaN воздух от фризеров (ss220-space#6515)

    commit bb529d3
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 12:05:55 2025 +0300

        add: Augury, Авто-отслеживание метеоров и палок (ss220-space#6512)

        * add: Augury, Авто-отслеживание метеоров и палок

        * fixing

    commit 77e43eb
    Author: Antoonij <[email protected]>
    Date:   Sat Feb 1 23:28:44 2025 +0100

        code_imp: Set key wrapper (ss220-space#6492)

        * 1

        * comsig mob login

        * fix

    commit 0e1e29e
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 01:27:28 2025 +0300

        bugfix: Вендоматы теперь правильно показывают(Откат часть перевода) (ss220-space#6511)

    commit 93bb6d2
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 01:27:16 2025 +0300

        bugfix: ИИ работает с голомапом теперь (ss220-space#6510)

        * bugfix: ИИ работает с голомапом теперь

        * fix

    commit a56df78
    Author: BeebBeebBoob <[email protected]>
    Date:   Sun Feb 2 01:27:02 2025 +0300

        bugfix: Засосывание двух людей в ДНК одновременно (ss220-space#6509)

        * bugfix: Засосывание двух людей в ДНК одновременно

        * fuck

    commit f1a5392
    Author: FlitchTime <[email protected]>
    Date:   Sun Feb 2 01:26:49 2025 +0300

        bugfix: Добавил новой зоне звуки от старой (ss220-space#6506)

        Добавил новой зоне звуки от старой

    commit 0aadff6
    Author: Changelog Generation <[email protected]>
    Date:   Fri Jan 31 05:57:21 2025 +0000

        Automatic changelog generation

    commit ade321e
    Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Date:   Fri Jan 31 08:55:29 2025 +0300

        Automatic NanoMap Update (ss220-space#6486)

        NanoMap Auto-Update (Fri Jan 31 01:23:17 UTC 2025)

        Co-authored-by: NanoMap Generation <[email protected]>

    commit 87e1aa4
    Author: dageavtobusnick <[email protected]>
    Date:   Fri Jan 31 10:54:35 2025 +0500

        admin: Несколько PM qol-ов (ss220-space#6497)

        * admin: Несколько PM qol-ов

        * adminhelps too

        * fix

    commit d6abd40
    Author: FlitchTime <[email protected]>
    Date:   Fri Jan 31 08:53:45 2025 +0300

        map: Заменил название зоны внешнего коридора спутника на Дельтах (ss220-space#6500)

        Зоны, которые фармят +1 -1 за каждый тайл

    commit eb610e3
    Author: littleboobs <[email protected]>
    Date:   Fri Jan 31 08:41:53 2025 +0300

        spellcheck: перевод датчиков костюма + фиксы локализации (ss220-space#6485)

        * датчики

        * fix

        * Apply suggestions from code review

        * Apply suggestions from code review

        * fix

        * fix

        * fix

        * fix

        * fix

        ---------

        Co-authored-by: PlayerUnknown14 <[email protected]>

    commit 90bd5bb
    Author: Antoonij <[email protected]>
    Date:   Fri Jan 31 06:41:25 2025 +0100

        add: object posession component (ss220-space#6461)

        * czponk

        * dme

        * 3

        * 4

        * fix ident

        * 5

        * fix

        * bright back rod possessed movement

        * trailing  newline

        * 1 fix

        * 2

    commit 216ecbd
    Author: FlitchTime <[email protected]>
    Date:   Fri Jan 31 08:39:05 2025 +0300

        bugfix: Задержка для дымогена и новый реагент взамен удалённого для ксеноборга (ss220-space#6495)

        * Задержка для дымогена и новый реагент взамен удалённого

        * Энергопотребление для "спреев" и дым для стан спрея

    commit beaaecb
    Author: dageavtobusnick <[email protected]>
    Date:   Fri Jan 31 10:37:39 2025 +0500

        bugfix: player panel fixes (ss220-space#6494)

        * bugfix: player panel fixes

        * sounds category

        * Update code/modules/admin/player_options_panel.dm

        Co-authored-by: BeebBeebBoob <[email protected]>

        * Update code/modules/admin/player_panel_veth.dm

        Co-authored-by: BeebBeebBoob <[email protected]>

        ---------

        Co-authored-by: BeebBeebBoob <[email protected]>

    commit 5be0b7b
    Author: Rafnik02 <[email protected]>
    Date:   Thu Jan 30 14:36:30 2025 +0700

        imageadd: органы, рюкзаки, папки в руки (ss220-space#6490)

        спрайтики

    commit 1788646
    Author: dageavtobusnick <[email protected]>
    Date:   Thu Jan 30 12:27:52 2025 +0500

        bugfix: Категория у Advanced Spawn + возможность удаления излучателя звука (ss220-space#6487)
  • Loading branch information
PlayerUnknown14 committed Feb 8, 2025
1 parent f1d1aaf commit aef0c2a
Show file tree
Hide file tree
Showing 88 changed files with 801 additions and 559 deletions.
69 changes: 40 additions & 29 deletions _maps/map_files/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -25651,6 +25651,8 @@
name = "east station intercom (General)";
pixel_x = 28
},
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
Expand Down Expand Up @@ -26360,20 +26362,14 @@
req_access = list(47)
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
/obj/machinery/door/poddoor/preopen{
id_tag = "Biohazard";
name = "Biohazard Shutter";
opacity = 0
name = "Biohazard Shutter"
},
/obj/machinery/door/poddoor/shutters{
density = 0;
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
icon_state = "open";
id_tag = "rdlab";
name = "Research and Development Lab Shutters";
opacity = 0
name = "Research Desk Shutters"
},
/turf/simulated/floor/plating,
/area/toxins/lab)
Expand Down Expand Up @@ -66400,20 +66396,14 @@
/area/hallway/primary/starboard/east)
"kBi" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
/obj/machinery/door/poddoor/preopen{
id_tag = "Biohazard";
name = "Biohazard Shutter";
opacity = 0
name = "Biohazard Shutter"
},
/obj/machinery/door/poddoor/shutters{
density = 0;
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
icon_state = "open";
id_tag = "rdlab";
name = "Research and Development Lab Shutters";
opacity = 0
name = "Research Desk Shutters"
},
/turf/simulated/floor/plating,
/area/toxins/lab)
Expand Down Expand Up @@ -66607,13 +66597,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/genetics)
"kIe" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/lab)
"kIr" = (
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
Expand Down Expand Up @@ -72241,6 +72224,34 @@
},
/turf/simulated/floor/plasteel,
/area/hallway/primary/starboard/east)
"oBC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/window/brigdoor{
dir = 1;
id = "Autolathe";
name = "Autolathe Access";
req_access = list(47)
},
/obj/item/stack/sheet/glass{
amount = 10
},
/obj/item/stack/sheet/metal{
amount = 10
},
/obj/machinery/autolathe,
/obj/machinery/door/poddoor/preopen{
id_tag = "Biohazard";
name = "Biohazard Shutter"
},
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
id_tag = "rdlab";
name = "Research Desk Shutters"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/toxins/lab)
"oCq" = (
/obj/structure/window/reinforced{
dir = 8
Expand Down Expand Up @@ -134857,8 +134868,8 @@ cWJ
bwv
gkd
bwv
bUQ
kIe
oBC
bSz
bSz
bIt
bNp
Expand Down
2 changes: 2 additions & 0 deletions _maps/map_files/generic/CentComm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -33235,6 +33235,7 @@
/obj/structure/sign/poster/contraband/punch_shit{
pixel_y = 32
},
/obj/effect/landmark/prisonsecuritywarp,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
Expand Down Expand Up @@ -46044,6 +46045,7 @@
/area/centcom/specops)
"vdf" = (
/obj/structure/chair/stool,
/obj/effect/landmark/prisonsecuritywarp,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@
#define ADMIN_VERBOSEJMP(src) "[src ? "[AREACOORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
#define ADMIN_SHOWDETAILS(mask, content) "<a href='byond://?_src_=holder;showdetails=[html_encode(content)]'>[mask]</a>"


#define BAN_HOURS * 60
#define BAN_DAYS BAN_HOURS * 24
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,8 @@
#define COMSIG_MOB_ITEM_ATTACK "mob_item_attack"
#define COMPONENT_ITEM_NO_ATTACK (1<<0)

#define COMSIG_GLOVES_DOUBLE_HANDS_TOUCH "gloves_double_hands_touch"

///from base of /mob/living/proc/get_incoming_damage_modifier(): (list/damage_mods, damage, damagetype, def_zone, sharp, used_weapon)
#define COMSIG_MOB_APPLY_DAMAGE_MODIFIERS "mob_apply_damage_modifiers"
///from base of /mob/living/proc/get_blocking_resistance(): (list/damage_resistances, damage, damagetype, def_zone, sharp, used_weapon)
Expand Down
5 changes: 4 additions & 1 deletion code/__DEFINES/dcs/signals_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#define COMSIG_SPEED_POTION_APPLIED "speed_potion"
#define SPEED_POTION_STOP (1<<0)

///from base of [/obj/proc/update_integrity]: (old_value, new_value)
#define COMSIG_OBJ_INTEGRITY_CHANGED "obj_integrity_changed"

Expand All @@ -32,3 +32,6 @@
///from [/obj/structure/closet/supplypod/proc/preOpen]:
#define COMSIG_SUPPLYPOD_LANDED "supplypodgoboom"


/// from /datum/surgery_step/proc/initiate() : (&time)
#define COMSIG_SURGERY_STEP_INIT "surgery_step_init"
4 changes: 2 additions & 2 deletions code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)

/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
if(value == FALSE) //nothing should be calling us with a number, so this is safe
value = input("Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text
value = tgui_input_text(usr, "Enter type to find (blank for all, cancel to cancel)", "Search for type", encode = FALSE)
if(isnull(value))
return
value = trim(value)
Expand All @@ -1475,7 +1475,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
if(matches.len == 1)
chosen = matches[1]
else
chosen = input("Select a type", "Pick Type", matches[1]) as null|anything in matches
chosen = tgui_input_list(usr, "Select a type", "Pick Type", matches, matches[1])
if(!chosen)
return
chosen = matches[chosen]
Expand Down
2 changes: 2 additions & 0 deletions code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ GLOBAL_VAR(genname) //Nanotrasen officer name for fax send via fax panel, random

GLOBAL_VAR_INIT(pacifism_after_gt, FALSE)

GLOBAL_VAR_INIT(full_lockdown, FALSE)

GLOBAL_VAR_INIT(communications_blackout, FALSE)

///All currently running polls held as datums
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,8 @@ SUBSYSTEM_DEF(ticker)
Master.SetRunLevel(RUNLEVEL_GAME)

// Generate the list of empty playable AI cores in the world
for(var/obj/effect/landmark/start/S in GLOB.landmarks_list)
if(S.name != JOB_TITLE_AI)
for(var/obj/effect/landmark/S as anything in GLOB.landmarks_list)
if(S.name != JOB_TITLE_AI && !(triai && S.name == /obj/effect/landmark/event/tripai::name))
continue
if(locate(/mob/living) in S.loc)
continue
Expand Down
1 change: 1 addition & 0 deletions code/datums/components/defibrillator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
var/effect_target = isnull(actual_unit) ? parent : actual_unit

RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(trigger_defib))
RegisterSignal(parent, COMSIG_GLOVES_DOUBLE_HANDS_TOUCH, PROC_REF(trigger_defib))
RegisterSignal(effect_target, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag))
RegisterSignal(effect_target, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp))

Expand Down
9 changes: 9 additions & 0 deletions code/datums/components/label.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,18 @@
/datum/component/label/proc/apply_label()
var/atom/owner = parent
owner.name += " ([label_name])"
if(owner.ru_names)
for(var/i = 1; i <= 6; i++)
owner.ru_names[i] += " ([label_name])"

/// Removes the label from the parent's name
/datum/component/label/proc/remove_label()
var/atom/owner = parent
owner.name = replacetext(owner.name, "([label_name])", "") // Remove the label text from the parent's name, wherever it's located.
if(owner.ru_names)
for(var/i = 1; i <= 6; i++)
owner.ru_names[i] = replacetext(owner.ru_names[i], "([label_name])", "")
owner.name = trim(owner.name) // Shave off any white space from the beginning or end of the parent's name.
if(owner.ru_names)
for(var/i = 1; i <= 6; i++)
owner.ru_names[i] = trim(owner.ru_names[i])
45 changes: 27 additions & 18 deletions code/datums/datumvars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
to_chat(usr, "This can only be used on instances of type /mob", confidential=TRUE)
return

var/new_name = reject_bad_name(sanitize(copytext_char(input(usr, "What would you like to name this mob?", "Input a name", M.real_name) as text|null, 1, MAX_NAME_LEN)), allow_numbers = TRUE)
var/new_name = reject_bad_name(sanitize(tgui_input_text(usr, "What would you like to name this mob?", "Input a name", M.real_name, encode = FALSE, max_length = MAX_NAME_LEN)), allow_numbers = TRUE)
if( !new_name || !M )
return

Expand Down Expand Up @@ -798,7 +798,7 @@
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human", confidential=TRUE)
return

var/confirm = alert("Are you sure you want to turn this mob into a skeleton?","Confirm Skeleton Transformation","Yes","No")
var/confirm = tgui_alert(usr, "Are you sure you want to turn this mob into a skeleton?", "Confirm Skeleton Transformation", list("Yes", "No"))
if(confirm != "Yes")
return

Expand Down Expand Up @@ -833,14 +833,14 @@
to_chat(usr, "This can only be used on instances of type /obj", confidential=TRUE)
return

var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
var/action_type = tgui_alert(usr, "Strict type ([O.type]) or type and all subtypes?",, list("Strict type", "Type and subtypes", "Cancel"))
if(action_type == "Cancel" || !action_type)
return

if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes")
if(tgui_alert(usr, "Are you really sure you want to delete all objects of type [O.type]?",, list("Yes", "No")) != "Yes")
return

if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
if(tgui_alert(usr, "Second confirmation required. Delete?",, list("Yes", "No")) != "Yes")
return

var/O_type = O.type
Expand Down Expand Up @@ -903,12 +903,12 @@
displaylist = list()
for(var/key in armorlist)
displaylist += "[key] = [armorlist[key]]"
result = input(usr, "Select an armor type to modify..", "Modify armor") as null|anything in displaylist + "(ADD ALL)" + "(SET ALL)" + "(DONE)"
result = tgui_input_list(usr, "Select an armor type to modify..", "Modify armor", displaylist + "(ADD ALL)" + "(SET ALL)" + "(DONE)")

if(result == "(DONE)")
break
else if(result == "(ADD ALL)" || result == "(SET ALL)")
var/new_amount = input(usr, result == "(ADD ALL)" ? "Enter armor to add to all types:" : "Enter new armor value for all types:", "Modify all types") as num|null
var/new_amount = tgui_input_number(usr, result == "(ADD ALL)" ? "Enter armor to add to all types:" : "Enter new armor value for all types:", "Modify all types")
if(isnull(new_amount))
continue
var/proper_amount = text2num(new_amount)
Expand All @@ -923,7 +923,7 @@
var/type = fields[1]
if(isnull(armorlist[type]))
continue
var/new_amount = input(usr, "Enter new armor value for [type]:", "Modify [type]") as num|null
var/new_amount = tgui_input_number(usr, "Enter new armor value for [type]:", "Modify [type]")
if(isnull(new_amount))
continue
var/proper_amount = text2num(new_amount)
Expand Down Expand Up @@ -1060,7 +1060,7 @@
var/method = vv_subtype_prompt(target.type)
targets_to_remove_from = get_all_of_type(target.type, method)

if(alert(usr, "Are you sure you want to mass-delete [path] on [target.type]?", "Mass Remove Confirmation", "Yes", "No") == "No")
if(tgui_alert(usr, "Are you sure you want to mass-delete [path] on [target.type]?", "Mass Remove Confirmation", list("Yes", "No")) == "No")
return

for(var/datum/target_to_remove_from as anything in targets_to_remove_from)
Expand Down Expand Up @@ -1112,7 +1112,9 @@
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human", confidential=TRUE)
return

if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return
if(tgui_alert(usr, "Confirm mob type change?",, list("Transform", "Cancel")) != "Transform")
return

if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand All @@ -1126,7 +1128,9 @@
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human", confidential=TRUE)
return

if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return
if(tgui_alert(usr, "Confirm mob type change?",, list("Transform", "Cancel")) != "Transform")
return

if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand All @@ -1140,7 +1144,8 @@
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human", confidential=TRUE)
return

if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return
if(tgui_alert(usr, "Confirm mob type change?",, list("Transform", "Cancel")) != "Transform")
return
if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand All @@ -1154,7 +1159,8 @@
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human", confidential=TRUE)
return

if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return
if(tgui_alert(usr, "Confirm mob type change?",, list("Transform", "Cancel")) != "Transform")
return
if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand All @@ -1168,7 +1174,9 @@
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human", confidential=TRUE)
return

if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return
if(tgui_alert(usr, "Confirm mob type change?",, list("Transform", "Cancel")) != "Transform")
return

if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand All @@ -1182,7 +1190,8 @@
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human", confidential=TRUE)
return

if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return
if(tgui_alert(usr, "Confirm mob type change?",, list("Transform", "Cancel")) != "Transform")
return
if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand Down Expand Up @@ -1316,7 +1325,7 @@
possibleverbs -= H.verbs
possibleverbs += "Cancel" // ...And one for the bottom

var/verb = input("Select a verb!", "Verbs",null) as anything in possibleverbs
var/verb = tgui_input_list(usr, "Select a verb!", "Verbs", possibleverbs, null)
if(!H)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
return
Expand Down Expand Up @@ -1406,7 +1415,7 @@

var/Text = href_list["adjustDamage"]

var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
var/amount = tgui_input_number(usr, "Deal how much damage to mob? (Negative values here heal)", "Adjust [Text]loss", 0)

if(!L)
to_chat(usr, "Mob doesn't exist anymore", confidential=TRUE)
Expand Down Expand Up @@ -1590,7 +1599,7 @@
return

var/variable = L[index]
var/prompt = alert("Do you want to remove item number [index] from list?", "Confirm", "Yes", "No")
var/prompt = tgui_alert(usr, "Do you want to remove item number [index] from list?", "Confirm", list("Yes", "No"))
if(prompt != "Yes")
return
L.Cut(index, index+1)
Expand Down
Loading

0 comments on commit aef0c2a

Please sign in to comment.