Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 9974b5a
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 19:04:26 2025 +0500

    tweak: mob_suspension now affects mob spawners (ss220-space#6429)

commit a46088f
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 19:00:11 2025 +0500

    admin: mass anime button fix (ss220-space#6430)

    * admin: mass anime button fix

    * fix

commit 4cda2dc
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:57:21 2025 +0500

    admin: Настройка форс событий

commit 0f72561
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:55:58 2025 +0500

    bugfix: Кнопки алёртов теперь вмещаются

    * bugfix: tgui alert fix

    * text inputs too

    * Update tgui.bundle.js

    * Update tgui.bundle.js

commit 3e08a50
Author: Sheya <[email protected]>
Date:   Mon Jan 27 16:48:05 2025 +0300

    add: Хамелеон шеи в хамелеон ките

    * СЕ дай пояс

    * da

    * suka blyat

commit ea35048
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:44:46 2025 +0500

    admin: Админы теперь могут отменять события

    * admin: admins now can cancel events

    * Update code/modules/events/event.dm

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

    * Update code/modules/events/event.dm

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

    ---------

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

commit d9ef15c
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:39:51 2025 +0500

    qol: Шёпот теперь по умолчанию Shift+T

    * qol: shiftT for wisper

    * fix xdd

commit 533956a
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:22:00 2025 +0500

    admin: подправление разделов, исправление недочётов

    * admin: admin updates fix

    * fix

commit 9dd238c
Author: Honker9999999 <[email protected]>
Date:   Mon Jan 27 15:17:48 2025 +0200

    bugfix: plasmamate kit (ss220-space#6465)

commit 846b1f2
Author: PlayerUnknown14 <[email protected]>
Date:   Mon Jan 27 20:15:06 2025 +0700

    bugfix: стало возможным мыть голову при выборе головы (ss220-space#6466)

    пум

commit 0893db9
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:12:57 2025 +0500

    bugfix: Ящики в упаковке теперь правильно удаляются на карго шаттле (ss220-space#6467)

    bugfix: wrapped create contents now delete in centcomm

commit d8a28db
Author: dageavtobusnick <[email protected]>
Date:   Mon Jan 27 18:11:37 2025 +0500

    bugfix: anomalies bugfix (ss220-space#6468)

    * bugfix: animalies bugfix

    * fix

commit 2b3116a
Author: BeebBeebBoob <[email protected]>
Date:   Mon Jan 27 16:10:59 2025 +0300

    admin: Player Panel & PP Panel TGUI (ss220-space#6440)

    * admin: Player Panel & PP Panel TGUI

    * whoops

    * ok

    * More stuff, fixing stuff

    * final touches and BUNDLE

    * fuck

commit 8b32c29
Author: Honker9999999 <[email protected]>
Date:   Sun Jan 26 21:17:47 2025 +0200

    bugfix: ghostface and autodrobe (ss220-space#6463)

commit 7d6d0e9
Author: PlayerUnknown14 <[email protected]>
Date:   Mon Jan 27 01:41:16 2025 +0700

    spellcheck: item sizes (ss220-space#6457)

    Угу

commit b32899f
Author: TimChi <[email protected]>
Date:   Sun Jan 26 21:32:13 2025 +0300

    bugfix: TGUI input for paper working incorrectly (ss220-space#6437)

    * hotfix: TGUI input for paper working incorrectly

    * Update code/modules/paperwork/paper.dm

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

    * Update code/modules/paperwork/paper.dm

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

    ---------

    Co-authored-by: dageavtobusnick <[email protected]>
    Co-authored-by: Den109G <[email protected]>

commit f54387f
Author: dageavtobusnick <[email protected]>
Date:   Sun Jan 26 23:28:40 2025 +0500

    bugfix: fix text input extra encoding (ss220-space#6436)

commit 670af75
Author: TimChi <[email protected]>
Date:   Sun Jan 26 21:27:42 2025 +0300

    add: Ghosts can toggles their sight (ss220-space#6426)

    * :3

    * Важно

    * Update code/modules/mob/dead/observer/observer.dm

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

    * Update observer.dm

    * Update code/modules/mob/dead/observer/observer.dm

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

    * Update observer.dm

    * Update code/modules/mob/dead/observer/observer.dm

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

    * Update observer.dm

    ---------

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

commit f08a37b
Author: dageavtobusnick <[email protected]>
Date:   Sun Jan 26 23:26:05 2025 +0500

    bugfix: Advanced ProcCall global procs fix (ss220-space#6434)

commit 04fd258
Author: dageavtobusnick <[email protected]>
Date:   Sun Jan 26 23:18:24 2025 +0500

    admin: no vv verb for moders (ss220-space#6428)

commit d7df5a9
Author: dageavtobusnick <[email protected]>
Date:   Sun Jan 26 14:47:05 2025 +0500

    admin: atom_say in vv (ss220-space#6452)

    * add: atom_say in vv

    * Update code/datums/datumvars.dm

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

    * Update code/datums/datumvars.dm

    ---------

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

commit 9d88ff7
Author: BeebBeebBoob <[email protected]>
Date:   Sun Jan 26 12:02:23 2025 +0300

    Revert "del: SSblackbox system Removal" (ss220-space#6456)

    Revert "del: SSblackbox system Removal (ss220-space#6388)"

    This reverts commit 314166e.

commit 314166e
Author: BeebBeebBoob <[email protected]>
Date:   Sat Jan 25 21:24:33 2025 +0300

    del: SSblackbox system Removal (ss220-space#6388)

    * del: SSblackbox system Removal

    * LINTER?? HELLO? Removes blackbox sys define

    * Update dbconfig.txt

    * Update misc.dm

    * Update dbconfig.txt

commit 18e8bbe
Author: Vesterlim13 <[email protected]>
Date:   Sat Jan 25 17:44:12 2025 +0300

    admin: coldcolony update2 (ss220-space#6433)
  • Loading branch information
PlayerUnknown14 committed Jan 27, 2025
1 parent 433cf57 commit 84cb6d3
Show file tree
Hide file tree
Showing 61 changed files with 7,600 additions and 3,904 deletions.
9,135 changes: 5,605 additions & 3,530 deletions _maps/map_files/event/Station/coldcolony.dmm

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions code/datums/components/spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@

/datum/component/spawner/proc/try_spawn_mob()
var/atom/P = parent
var/turf/T = get_turf(P)
if(GLOB.mob_suspension && T && !length(SSmobs?.clients_by_zlevel[T.z]))
return FALSE
if(spawned_mobs.len >= max_mobs)
return 0
return FALSE
if(spawn_delay > world.time)
return 0
return FALSE
spawn_delay = world.time + spawn_time
var/chosen_mob_type = pickweight(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(P.loc)
Expand Down
14 changes: 13 additions & 1 deletion code/datums/datumvars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@

/client/proc/debug_variables(datum/D in world)
set name = "\[Admin\] View Variables"
set category = "Admin.Debug"

var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round.

Expand Down Expand Up @@ -1481,6 +1480,19 @@
A.stop_deadchat_plays()
log_and_message_admins("removed deadchat control from [A].")

if(href_list["atom_say"])
if(!check_rights(R_EVENT))
return

var/atom/object = locateUID(href_list["atom_say"])
if(!istype(object))
return
var/say_text = tgui_input_text(usr, "Введите текст, который будет озвучен объектом", "Введите текст", multiline = TRUE, encode = FALSE)

object.atom_say(say_text)

log_and_message_admins("atom_said on behalf of [object] the following: [say_text].")

/client/proc/view_var_Topic_list(href, href_list, hsrc)
if(href_list["VarsList"])
debug_variables(locate(href_list["VarsList"]))
Expand Down
2 changes: 1 addition & 1 deletion code/datums/keybindings/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
. = ..()
if(.)
return .
user.holder.player_panel_new()
user.holder.player_panel_veth()
return TRUE


Expand Down
2 changes: 1 addition & 1 deletion code/datums/keybindings/communication_keybinds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

/datum/keybinding/client/communication/whisper
name = WHISPER_CHANNEL
keys = list("U")
keys = list("ShiftT")
mute_category = MUTE_IC

/datum/keybinding/client/communication/radio
Expand Down
2 changes: 1 addition & 1 deletion code/datums/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2386,7 +2386,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
/obj/item/circuitboard/vendor/plasmamate)
cost = 100
containername = "plasmamate pack crate"
required_tech = list("toxins" = 5, "plasma" = 6)
required_tech = list("toxins" = 5, "plasmatech" = 6)

/datum/supply_packs/misc/religious_supplies
name = "Religious Supplies Crate"
Expand Down
11 changes: 2 additions & 9 deletions code/datums/weather/weather_types/snow_storm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
end_message = span_boldannounceic("The snowfall dies down, it should be safe to go outside again.")
end_overlay = "light_snow"

area_type = /area/vision_change_area/awaymission/evil_santa_storm
target_trait = AWAY_LEVEL
area_type = /area/ruin/unpowered/coldcolony_outside
target_trait = STATION_LEVEL

immunity_type = TRAIT_SNOWSTORM_IMMUNE

Expand Down Expand Up @@ -82,22 +82,15 @@

/datum/weather/snow_storm/weather_act(mob/living/target)
var/temp_drop = -rand(10, 25)
var/freeze_chance = 35

if(ishuman(target))
var/mob/living/carbon/human/human_target = target
var/cold_protection = 2 - human_target.get_cold_protection()
temp_drop *= cold_protection
freeze_chance *= cold_protection

else if(istype(target, /mob/living/simple_animal/borer))
var/mob/living/simple_animal/borer/borer = target
var/cold_protection = 2 - borer.host?.get_cold_protection()
temp_drop *= cold_protection
freeze_chance *= cold_protection

target.adjust_bodytemperature(temp_drop)

if(target.bodytemperature <= TCMB && prob(freeze_chance))
target.apply_status_effect(/datum/status_effect/freon)

4 changes: 4 additions & 0 deletions code/game/area/ss13_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ This applies to all STANDARD station areas

/area/shuttle/pirate_corvette
name = "Pirate Corvette"
requires_power = TRUE
icon_state = "shuttle"
area_flags = NONE

Expand Down Expand Up @@ -3343,3 +3344,6 @@ GLOBAL_LIST_INIT(centcom_areas, list(
name = "\improper House"
icon_state = "red"

/area/coldcolony/ruin/abandoned_garage
name = "\improper Mech Garage"
icon_state = "mining"
1 change: 1 addition & 0 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
var/turf/curturf = get_turf(src)
if(curturf)
.["Jump to turf"] = "?_src_=holder;adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]"
.["Atom say"] = "?_src_=vars;atom_say=[UID()]"
.["Add reagent"] = "?_src_=vars;addreagent=[UID()]"
.["Edit reagents"] = "?_src_=vars;editreagents=[UID()]"
.["Transform editor"] = "?_src_=vars;matrix_tester=[UID()]"
Expand Down
18 changes: 9 additions & 9 deletions code/game/machinery/computer/communications.dm
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@
if(message_cooldown > world.time)
to_chat(ui.user, span_warning("Пожалуйста, подождите, прежде чем сделать новое объявление."))
return
var/input = tgui_input_text(ui.user, "Пожалуйста, напишите своё сообщение экипажу станции.", "Приоритетное оповещение", multiline = TRUE)
if(!input || message_cooldown > world.time || ..() || !(is_authenticated(ui.user) == COMM_AUTHENTICATION_CAPT))
var/input = tgui_input_text(ui.user, "Пожалуйста, напишите своё сообщение экипажу станции.", "Приоритетное оповещение", multiline = TRUE, encode = FALSE)
if(!input || message_cooldown > world.time || ..() || !(is_authenticated(ui.user) >= COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_MSGLEN_MINIMUM)
to_chat(ui.user, span_warning("Сообщение '[input]' слишком короткое. Минимальное число символов - [COMM_MSGLEN_MINIMUM]."))
Expand All @@ -182,7 +182,7 @@
message_cooldown = world.time + 600 //One minute

if("callshuttle")
var/input = tgui_input_text(ui.user, "Пожалуйста, укажите причину вызова шаттла", "Причина вызова шаттла.","")
var/input = tgui_input_text(ui.user, "Пожалуйста, укажите причину вызова шаттла", "Причина вызова шаттла.","", encode = FALSE)
if(!input || ..() || !is_authenticated(ui.user))
return
call_shuttle_proc(ui.user, input)
Expand Down Expand Up @@ -256,7 +256,7 @@
if(centcomm_message_cooldown > world.time)
to_chat(ui.user, span_warning("Обработка массивов. Пожалуйста, подождите."))
return
var/input = tgui_input_text(ui.user, "Пожалуйста, укажите причину запроса кодов от устройства самоуничтожения. Злоупотребление системой запросов кодов недопустимо ни при каких обстоятельствах. Запрос не гарантирует ответа.", "Запрос кодов устройства самоуничтожения.")
var/input = tgui_input_text(ui.user, "Пожалуйста, укажите причину запроса кодов от устройства самоуничтожения. Злоупотребление системой запросов кодов недопустимо ни при каких обстоятельствах. Запрос не гарантирует ответа.", "Запрос кодов устройства самоуничтожения.", encode = FALSE)
if(isnull(input) || ..() || !(is_authenticated(ui.user) >= COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_CCMSGLEN_MINIMUM)
Expand All @@ -274,7 +274,7 @@
if(centcomm_message_cooldown > world.time)
to_chat(ui.user, span_warning("Обработка массивов. Пожалуйста, подождите."))
return
var/input = tgui_input_text(ui.user, "Пожалуйста, выберите сообщение для передачи Центральному Командованию посредством квантовой запутанности. Имейте в виду, что этот процесс очень дорогостоящий, и злоупотребление этой системой крайне нежелательно. Передача не гарантирует ответа", "Сообщение на ЦК")
var/input = tgui_input_text(ui.user, "Пожалуйста, выберите сообщение для передачи Центральному Командованию посредством квантовой запутанности. Имейте в виду, что этот процесс очень дорогостоящий, и злоупотребление этой системой крайне нежелательно. Передача не гарантирует ответа", "Сообщение на ЦК", encode = FALSE)
if(!input || ..() || !(is_authenticated(ui.user) == COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_CCMSGLEN_MINIMUM)
Expand All @@ -293,7 +293,7 @@
if(centcomm_message_cooldown > world.time)
to_chat(ui.user, "Обработка массивов. Пожалуйста, подождите.")
return
var/input = tgui_input_text(ui.user, "Пожалуйста, выберите сообщение для передачи в \[АНОМАЛЬНЫЕ КОРДИНАТЫ МАРШРУТИЗАЦИИ\] посредством квантовой запутанности. Имейте в виду, что этот процесс очень дорогостоящий, и злоупотребление этой системой крайне нежелательно. Передача не гарантирует ответа.", "Отправить сообщение")
var/input = tgui_input_text(ui.user, "Пожалуйста, выберите сообщение для передачи в \[АНОМАЛЬНЫЕ КОРДИНАТЫ МАРШРУТИЗАЦИИ\] посредством квантовой запутанности. Имейте в виду, что этот процесс очень дорогостоящий, и злоупотребление этой системой крайне нежелательно. Передача не гарантирует ответа.", "Отправить сообщение", encode = FALSE)
if(!input || ..() || !(is_authenticated(ui.user) == COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_CCMSGLEN_MINIMUM)
Expand Down Expand Up @@ -438,9 +438,9 @@
"line_2" = (stat_msg2 ? stat_msg2 : "-----"),

"presets" = list(
list("name" = "blank", "label" = "Чисто", "desc" = "Чистый лист"),
list("name" = "shuttle", "label" = "Расчётное время прибытия шаттла", "desc" = "Показать, сколько времени осталось до прибытия шаттла."),
list("name" = "message", "label" = "Сообщение", "desc" = "Пользовательское сообщение.")
list("name" = "blank", "id" = STATUS_DISPLAY_BLANK, "label" = "Чисто", "desc" = "Чистый лист"),
list("name" = "shuttle", "id" = STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME, "label" = "Расчётное время прибытия шаттла", "desc" = "Показать, сколько времени осталось до прибытия шаттла."),
list("name" = "message", "id" = STATUS_DISPLAY_MESSAGE, "label" = "Сообщение", "desc" = "Пользовательское сообщение.")
),

"alerts"=list(
Expand Down
16 changes: 15 additions & 1 deletion code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2582,6 +2582,20 @@
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/gun/magic/wand = 1,
/obj/item/clothing/mask/balaclava =1,
/obj/item/clothing/under/syndicate/blackops_civ = 1,
/obj/item/clothing/glasses/thermal_fake = 1,
/obj/item/clothing/mask/horsehead = 2)
premium = list(/obj/item/clothing/suit/hgpirate = 1,
/obj/item/clothing/head/hgpiratecap = 1,
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionaire/fake = 1,
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
/obj/item/clothing/under/cuban_suit = 1,
/obj/item/clothing/head/cuban_hat = 1,
/obj/item/clothing/under/ussptracksuit_black = 1,
/obj/item/clothing/under/ussptracksuit_white = 1,
/obj/item/clothing/under/steampunkdress = 1,
/obj/item/clothing/suit/hooded/hijab = 1)
Expand Down Expand Up @@ -5099,7 +5113,7 @@
/obj/item/storage/lockbox/plasma/atmos = 1,
/obj/item/storage/lockbox/plasma/mime = 5,
/obj/item/storage/lockbox/plasma/clown = 5,
/obj/item/storage/lockbox/plasma/blueshield = 1,
/obj/item/storage/lockbox/plasma/blueshield = 1
)

refill_canister = /obj/item/vending_refill/plasma
Expand Down
7 changes: 4 additions & 3 deletions code/game/objects/effects/anomalies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
START_PROCESSING(SSobj, src)
impact_area = get_area(src)

if(!impact_area)
if(!impact_area || impact_area.outdoors)
return INITIALIZE_HINT_QDEL

drops_core = _drops_core
Expand All @@ -55,7 +55,8 @@
GLOB.poi_list.Remove(src)
STOP_PROCESSING(SSobj, src)
QDEL_NULL(countdown)
QDEL_NULL(aSignal)
if(!ispath(aSignal))
QDEL_NULL(aSignal)
return ..()

/obj/effect/anomaly/process()
Expand Down Expand Up @@ -254,7 +255,7 @@
investigate_log("teleported [key_name_log(moving_atom)] to [COORD(moving_atom)]", INVESTIGATE_TELEPORTATION)

/obj/effect/anomaly/bluespace/detonate()
if(!mass_teleporting)
if(!mass_teleporting || impact_area.outdoors)
return
var/turf/T = pick(get_area_turfs(impact_area))
if(T)
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -288,19 +288,19 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
var/size
switch(src.w_class)
if(WEIGHT_CLASS_TINY)
size = "крохотный"
size = "крохотного"
if(WEIGHT_CLASS_SMALL)
size = "маленький"
size = "маленького"
if(WEIGHT_CLASS_NORMAL)
size = "обычного размера"
size = "среднего"
if(WEIGHT_CLASS_BULKY)
size = "большой"
size = "большого"
if(WEIGHT_CLASS_HUGE)
size = "огромный"
size = "огромного"
if(WEIGHT_CLASS_GIGANTIC)
size = "гигантский"
size = "гигантского"

. = ..(user, "", "Это [size] предмет.")
. = ..(user, "", "Это предмет [size] размера.")

if(user.research_scanner || user.check_smart_brain()) //Mob has a research scanner active.
var/msg = "*--------* <BR>"
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/weapons/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ To apply, hold the injector a short distance away from the outer thigh before ap
new /obj/item/clothing/mask/chameleon(src)
new /obj/item/storage/backpack/chameleon(src)
new /obj/item/radio/headset/chameleon(src)
new /obj/item/clothing/neck/chameleon(src)
new /obj/item/stamp/chameleon(src)
new /obj/item/pda/chameleon(src)
new /obj/item/pen/fakesign(src)
Expand Down Expand Up @@ -442,7 +443,7 @@ To apply, hold the injector a short distance away from the outer thigh before ap
)

/obj/item/storage/box/syndie_kit/ghostface_kit/populate_contents()
new /obj/item/clothing/head/hooded/ghostface/true(src)
new /obj/item/clothing/suit/hooded/ghostfacesuit/true(src)
new /obj/item/clothing/mask/gas/ghostface/true(src)
new /obj/item/melee/ghostface_knife(src)

Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/structures/watercloset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -571,10 +571,10 @@
return
var/selected_area = parse_zone(user.zone_selected)
var/washing_face = 0
if(selected_area in list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_PRECISE_EYES))
if(selected_area in list("голова", "рот", "глаза"))
washing_face = 1
user.visible_message("<span class='notice'>[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]...</span>", \
"<span class='notice'>You start washing your [washing_face ? "face" : "hands"]...</span>")
user.visible_message(span_notice("[user] начина[pluralize_ru(user.gender, "ет", "ют")] мыть [washing_face ? "своё лицо" : "свои руки"]..."), \
span_notice("Вы начинаете мыть [washing_face ? "своё лицо" : "свои руки"]..."))
busy = 1

if(!do_after(user, 4 SECONDS, src))
Expand All @@ -585,8 +585,8 @@

busy = 0

user.visible_message("<span class='notice'>[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src].</span>", \
"<span class='notice'>You wash your [washing_face ? "face" : "hands"] using [src].</span>")
user.visible_message(span_notice("[user] помыл[genderize_ru(user.gender, "", "а", "о", "и")] [washing_face ? "своё лицо" : "свои руки"], используя [declent_ru(ACCUSATIVE)]."), \
span_notice("Вы помыли [washing_face ? "своё лицо" : "свои руки"], используя [declent_ru(ACCUSATIVE)]."))

if(SEND_SIGNAL(user, COMSIG_SINK_ACT) & COMSIG_SINK_ACT_SUCCESS) // special sink acts
return
Expand Down
24 changes: 19 additions & 5 deletions code/modules/admin/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,24 @@ GLOBAL_VAR_INIT(nologevent, 0)

///////////////////////////////////////////////////////////////////////////////////////////////Panels

/datum/admins/proc/show_player_panel(var/mob/M in GLOB.mob_list)
/datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list)
set name = "\[Admin\] Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)"

if(!M)
to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.", confidential=TRUE)
return

if(!check_rights(R_ADMIN|R_MOD))
return

if(!check_rights(NONE))
return

usr.client.holder.vuap_open_context(M)

/datum/admins/proc/show_old_player_panel(mob/M)

if(!M)
to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.", confidential=TRUE)
return
Expand All @@ -86,7 +100,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\] "
body += "\[<a href='byond://?_src_=holder;getplaytimewindow=[M.UID()]'>" + M.client.get_exp_type(EXP_TYPE_CREW) + " as [EXP_TYPE_CREW]</a>\]"
body += "<br>BYOND account registration date: [M.client.byondacc_date || "ERROR"] [M.client.byondacc_age <= CONFIG_GET(number/byond_account_age_threshold) ? "<b>" : ""]([M.client.byondacc_age] days old)[M.client.byondacc_age <= CONFIG_GET(number/byond_account_age_threshold) ? "</b>" : ""]"
body += "<br>Global Ban DB Lookup: [CONFIG_GET(string/centcom_ban_db_url) ? "<a href='byond://?_src_=holder;open_ccbdb=[M.client.ckey]'>Lookup</a>" : "<i>Disabled</i>"]"
body += "<br>Global Ban DB Lookup: [CONFIG_GET(string/centcom_ban_db_url) ? "<a href='byond://?_src_=holder;open_ccDB=[M.client.ckey]'>Lookup</a>" : "<i>Disabled</i>"]"

body += "<br>"

Expand Down Expand Up @@ -245,7 +259,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
var/gene_name = GLOB.assigned_blocks[block]
if(gene_name)
var/text_color = "[M.dna.GetSEState(block) ? "#006600" : "#ff0000"]"
body += "<a href='byond://?_src_=holder;togmutate=[M.UID()];block=[block]' style='color:[text_color];'>[gene_name]</A><sub>[block]</sub>"
body += "<a href='byond://?_src_=holder;togmutate=[M.UID()];block=[block];version=old;' style='color:[text_color];'>[gene_name]</A><sub>[block]</sub>"
else
body += "[block]"
body += "</td>"
Expand Down Expand Up @@ -347,7 +361,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
dat += text("<tr><td>[t] (<a href='byond://?src=[UID()];removejobban=[r]'>unban</A>)</td></tr>")
dat += "</table>"
usr << browse(dat, "window=ban;size=400x400")


/datum/admins/proc/Game()
if(!check_rights(R_ADMIN))
Expand Down Expand Up @@ -774,7 +788,7 @@ GLOBAL_VAR_INIT(nologevent, 0)


/datum/admins/proc/spawn_atom(object as text)
set category = "Admin.Event Spawn"
set category = "Admin.Event"
set desc = "(путь атома) Создайте атом. Добавьте точку к тексту, чтобы исключить подтипы пути, соответствующего входным данным."
set name = "Spawn"

Expand Down
Loading

0 comments on commit 84cb6d3

Please sign in to comment.