Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translate: Skeleton stand-up #481

Merged
merged 4 commits into from
Oct 18, 2023
Merged

Translate: Skeleton stand-up #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
344367d
fix: ds link (#473)
Furrior Oct 17, 2023
6cd0703
costil: adds `show_title_screen` to new_player/Login(), as well as to…
Gaxeer Oct 17, 2023
c6a6b89
Skeleton
AyIong Oct 18, 2023
0595c00
10%
AyIong Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/species/skeleton_species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
for(var/obj/item/organ/external/L in our_organs)
if(L.mend_fracture())
break // We're only checking one limb here, bucko
if(prob(3))
H.say(pick("Thanks Mr. Skeltal", "Thank for strong bones", "Doot doot!"))
if(prob(10)) // SS220 EDIT: ORIGINAL - 3%
H.say(pick("Спасибо Мистеру Скелтал!", "От такого молока челюсть отвисает!", "Я вижу четКость своих решений!", "Надо не забыть пересчитать косточки...", "Маленькие скелеты паКостят!", "Хорошо что у меня язык без костей!", "Теперь я не буду ЧЕРЕПашкой!", "Теперь мне не нужны костыли!", "Костян плохого не посоветует!", "Ощущаешь мою ловКость?", "Я чувствую такую лёгКость!", "Большая редКость найти любимую жидКость!", "Моя любимая жидКость!", "Аж закостенел!", "Теперь я вешу скелетонну!", "Спасибо за крепкие кости!", "Ду-ду!", "Вы замечали что мы все в одной плосКости?"))
return TRUE

return ..()
Expand Down
9 changes: 5 additions & 4 deletions modular_ss220/discord_link/code/discord.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@
return

if(href_list["observe"] || href_list["ready"] || href_list["late_join"])
if (GLOB.configuration.database.enabled && GLOB.configuration.ss220_misc.force_discord_verification && !(client.prefs.discord_id || client.prefs.get_discord_id()))
to_chat(usr, span_danger("Вам необходимо привязать дискорд-профиль к аккаунту!"))
to_chat(usr, span_warning("Нажмите 'Привязка Discord' во вкладке 'Special Verbs' для получения инструкций."))
return FALSE
if (GLOB.configuration.database.enabled && GLOB.configuration.ss220_misc.force_discord_verification)
if(!client.prefs.discord_id || !(client.prefs.get_discord_id() && client.prefs.discord_id))
to_chat(usr, span_danger("Вам необходимо привязать дискорд-профиль к аккаунту!"))
to_chat(usr, span_warning("Нажмите 'Привязка Discord' во вкладке 'Special Verbs' для получения инструкций."))
return FALSE

. = ..()

Expand Down
1 change: 1 addition & 0 deletions modular_ss220/title_screen/code/new_player.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ GLOBAL_LIST_EMPTY(new_player_list)

/mob/new_player/Login()
. = ..()
show_title_screen()
Loading