Skip to content

Commit

Permalink
Код и ридми дописан
Browse files Browse the repository at this point in the history
  • Loading branch information
RalseiDreemuurr committed Jun 20, 2024
1 parent 32c9372 commit b17ffe6
Show file tree
Hide file tree
Showing 7 changed files with 152 additions and 33 deletions.
8 changes: 7 additions & 1 deletion code/modules/surgery/organs/tongue.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
/datum/language/ratvar
/datum/language/ratvar,
// [CELADON-ADD] - CELADON_ITEMS
/datum/language/elysm,
/datum/language/alquadim,
/datum/language/thayoss,
/datum/language/fuyo
// [/CELADON-ADD]
))

/obj/item/organ/tongue/Initialize(mapload)
Expand Down
5 changes: 3 additions & 2 deletions mod_celadon/items/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#### Список PRов:

- https://github.com/MysticalFaceLesS/Shiptest/pulls/#####
- https://github.com/CeladonSS13/Shiptest/pull/759
<!--
Ссылки на PRы, связанные с модом:
- Создание
Expand Down Expand Up @@ -30,7 +30,8 @@ ID мода: CELADON_ITEMS

### Изменения *кор кода*

- Отсутствуют
- `code/modules/surgery/organs/tongue.dm`
-`var/static/list/languages_possible_base = typecacheof`
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Expand Down
2 changes: 2 additions & 0 deletions mod_celadon/items/_items.dme
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@
#include "code/external_wears.dm"
#include "code/scarfes.dm"
#include "code/accessories.dm"
#include "code/books.dm"
#include "code/languages.dm"

#endif
137 changes: 123 additions & 14 deletions mod_celadon/items/code/books.dm
Original file line number Diff line number Diff line change
@@ -1,21 +1,96 @@
/obj/item/elysm_manual
name = "Empty book"
desc = "If you see this book, report to coders"
icon = 'icons/obj/library.dmi'
icon_state = "book2"
name = "Book of Elysm"
desc = "The book's cover reads: \"The national language of the Republic of Elysium, which is a mixture of Ard al-Elysm Almaveud and newly arrived settlers speaking a variation of Arabic 2378 Sol\""
icon = 'mod_celadon/items/icons/obj/book.dmi'
lefthand_file = 'mod_celadon/items/icons/mob/inhands/books_lefthand.dmi'
righthand_file = 'mod_celadon/items/icons/mob/inhands/books_righthand.dmi'
icon_state = "elysm_book"

/obj/item/elysm_manual/attack_self(mob/living/user)
if(!isliving(user))
return

if(user.has_language(/datum/language/elysm))
to_chat(user, "<span class='boldwarning'>You start skimming through [src], but you already know Elysm.</span>")
return

to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with arabic symbols.</span>")
user.grant_language(/datum/language/elysm, TRUE, TRUE, LANGUAGE_MIND)


/obj/item/elysm_manual/attack(mob/living/M, mob/living/user)
if(!istype(M) || !istype(user))
return
if(M == user)
attack_self(user)
return

playsound(loc, "punch", 25, TRUE, -1)

if(M.stat == DEAD)
M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>", "<span class='userdanger'>[user] smacks your lifeless corpse with [src].</span>", "<span class='hear'>You hear smacking.</span>")
else if(M.has_language(/datum/language/elysm))
M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='hear'>You hear smacking.</span>")
else
M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], arabic symbols flow through your mind.</span>", "<span class='hear'>You hear smacking.</span>")
M.grant_language(/datum/language/elysm, TRUE, TRUE, LANGUAGE_MIND)

/obj/item/alquadim_manual
name = "Book of Alquadim-Elysm"
desc = "The book's cover reads: \"The traditional ancient language of the Elysium Republic, originated in Ard al-Elysm Almaveuda, which are representatives of the Arabic language of 2147, isolated for almost 2 centuries\""
icon = 'mod_celadon/items/icons/obj/book.dmi'
lefthand_file = 'mod_celadon/items/icons/mob/inhands/books_lefthand.dmi'
righthand_file = 'mod_celadon/items/icons/mob/inhands/books_righthand.dmi'
icon_state = "alquadim_elysm"

/obj/item/codespeak_manual/attack_self(mob/living/user)
if(!isliving(user))
return

if(user.has_language(/datum/language/alquadim))
to_chat(user, "<span class='boldwarning'>You start skimming through [src], but you already know Alquadim-Elysm.</span>")
return

to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with arabic symbols.</span>")
user.grant_language(/datum/language/alquadim, TRUE, TRUE, LANGUAGE_MIND)


/obj/item/codespeak_manual/attack(mob/living/M, mob/living/user)
if(!istype(M) || !istype(user))
return
if(M == user)
attack_self(user)
return

playsound(loc, "punch", 25, TRUE, -1)

if(M.stat == DEAD)
M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>", "<span class='userdanger'>[user] smacks your lifeless corpse with [src].</span>", "<span class='hear'>You hear smacking.</span>")
else if(M.has_language(/datum/language/alquadim))
M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='hear'>You hear smacking.</span>")
else
M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], arabic symbols flow through your mind.</span>", "<span class='hear'>You hear smacking.</span>")
M.grant_language(/datum/language/alquadim, TRUE, TRUE, LANGUAGE_MIND)

/obj/item/thayos_manual
name = "Book of Thayoss"
desc = "The book's cover reads: \"The national language of the Thayos Interstellar Empire, which is a modification of Japanese 2475\""
icon = 'mod_celadon/items/icons/obj/book.dmi'
lefthand_file = 'mod_celadon/items/icons/mob/inhands/books_lefthand.dmi'
righthand_file = 'mod_celadon/items/icons/mob/inhands/books_righthand.dmi'
icon_state = "thayos_book"

/obj/item/codespeak_manual/attack_self(mob/living/user)
if(!isliving(user))
return

if(user.has_language(/datum/language/codespeak))
to_chat(user, "<span class='boldwarning'>You start skimming through [src], but you already know Codespeak.</span>")
if(user.has_language(/datum/language/thayoss))
to_chat(user, "<span class='boldwarning'>You start skimming through [src], but you already know Thayoss.</span>")
return

to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with codewords and responses.</span>")
user.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)
to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with japanese symbols.</span>")
user.grant_language(/datum/language/thayoss, TRUE, TRUE, LANGUAGE_MIND)

use_charge(user)

/obj/item/codespeak_manual/attack(mob/living/M, mob/living/user)
if(!istype(M) || !istype(user))
Expand All @@ -28,11 +103,45 @@

if(M.stat == DEAD)
M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>", "<span class='userdanger'>[user] smacks your lifeless corpse with [src].</span>", "<span class='hear'>You hear smacking.</span>")
else if(M.has_language(/datum/language/codespeak))
else if(M.has_language(/datum/language/thayoss))
M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='hear'>You hear smacking.</span>")
else
M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], codewords and responses flow through your mind.</span>", "<span class='hear'>You hear smacking.</span>")
M.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)
use_charge(user)
M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], japanese symbols flow through your mind.</span>", "<span class='hear'>You hear smacking.</span>")
M.grant_language(/datum/language/thayoss, TRUE, TRUE, LANGUAGE_MIND)

/obj/item/fuyo_manual
name = "Book of Fuyo"
desc = "The book's cover reads: \"The second language of the Taios Interstellar Empire, which is a modification of Chinese 2475\""
icon = 'mod_celadon/items/icons/obj/book.dmi'
lefthand_file = 'mod_celadon/items/icons/mob/inhands/books_lefthand.dmi'
righthand_file = 'mod_celadon/items/icons/mob/inhands/books_righthand.dmi'
icon_state = "fuyo_book"

/obj/item/codespeak_manual/attack_self(mob/living/user)
if(!isliving(user))
return

The book's cover reads: \"Codespeak(tm) - Secure your communication with metaphors so elaborate, they seem randomly generated!\
if(user.has_language(/datum/language/fuyo))
to_chat(user, "<span class='boldwarning'>You start skimming through [src], but you already know Fuyo.</span>")
return

to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with chinese symbols.</span>")
user.grant_language(/datum/language/fuyo, TRUE, TRUE, LANGUAGE_MIND)


/obj/item/codespeak_manual/attack(mob/living/M, mob/living/user)
if(!istype(M) || !istype(user))
return
if(M == user)
attack_self(user)
return

playsound(loc, "punch", 25, TRUE, -1)

if(M.stat == DEAD)
M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>", "<span class='userdanger'>[user] smacks your lifeless corpse with [src].</span>", "<span class='hear'>You hear smacking.</span>")
else if(M.has_language(/datum/language/fuyo))
M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='hear'>You hear smacking.</span>")
else
M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], chinese symbols flow through your mind.</span>", "<span class='hear'>You hear smacking.</span>")
M.grant_language(/datum/language/fuyo, TRUE, TRUE, LANGUAGE_MIND)
33 changes: 17 additions & 16 deletions mod_celadon/items/code/languages.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@
flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
space_chance = 40
syllables = list(
"za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz",
"ha", "ah", "he", "eh", "hi", "ih", "ho", "oh", "hu", "uh", "hs", "sh",
"la", "al", "le", "el", "li", "il", "lo", "ol", "lu", "ul", "ls", "sl",
"ka", "ak", "ke", "ek", "ki", "ik", "ko", "ok", "ku", "uk", "ks", "sk",
"sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss",
"ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr",
"a", "a", "e", "e", "i", "i", "o", "o", "u", "u", "s", "s"
"", "", "", "",
"", "", "", "",
"", "", "", "",
"", "", "", "",
"", "", "", "",
"", "", "", "",
"", "", "", ""
)
icon = "mod_celadon/items/icons/obj/language.dmi"
icon_state = "lizard"
icon_state = "thayos"
default_priority = 90

/datum/language/fuyo
Expand All @@ -62,14 +62,15 @@
flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
space_chance = 40
syllables = list(
"za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz",
"ha", "ah", "he", "eh", "hi", "ih", "ho", "oh", "hu", "uh", "hs", "sh",
"la", "al", "le", "el", "li", "il", "lo", "ol", "lu", "ul", "ls", "sl",
"ka", "ak", "ke", "ek", "ki", "ik", "ko", "ok", "ku", "uk", "ks", "sk",
"sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss",
"ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr",
"a", "a", "e", "e", "i", "i", "o", "o", "u", "u", "s", "s"
"", "", "",
"", "", "",
"", "", "艾和",
"", "伊可罗肯", "艾斯",
"", "", "",
"", "艾了", "",
"", "艾姆", "艾弗"
)
icon = "mod_celadon/items/icons/obj/language.dmi"
icon_state = "lizard"
icon_state = "fuyo"
default_priority = 90

Binary file modified mod_celadon/items/icons/mob/inhands/books_lefthand.dmi
Binary file not shown.
Binary file modified mod_celadon/items/icons/mob/inhands/books_righthand.dmi
Binary file not shown.

0 comments on commit b17ffe6

Please sign in to comment.