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

ascent #70

Merged
merged 2 commits into from
Dec 6, 2024
Merged

ascent #70

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e24422c
ascent
Danilcus-W Dec 2, 2024
2b16ed1
MS(Q) cannot speak shinese
Danilcus-W Dec 4, 2024
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
10 changes: 6 additions & 4 deletions mods/_fd/ascent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

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

- Отсутствуют
- https://github.com/RepoStash/FD-NewBay/pull/67
<!--
Ссылки на PRы, связанные с модом:
- Создание
Expand Down Expand Up @@ -33,7 +33,8 @@ ID мода: ASCENT
- `/datum/reagent/toxin/bromide/affect_ingest()`
- `/datum/reagent/toxin/methyl_bromide/affect_touch()`
- `/datum/reagent/toxin/methyl_bromide/affect_ingest()`

- `code/yummy_organs.dm`:
- `/obj/item/reagent_containers/food/snacks/organ/use_before()`
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Expand Down Expand Up @@ -79,8 +80,9 @@ ID мода: ASCENT

### Авторы:

Unknown
>https://github.com/Baystation12/Baystation12/commit/b5b3f37e9c15a8ac69be658187c1d5a79df85a34
Danilcus
>Unknown
https://github.com/Baystation12/Baystation12/commit/b5b3f37e9c15a8ac69be658187c1d5a79df85a34
<!--
Здесь находится твой никнейм
Если работал совместно - никнеймы тех, кто помогал.
Expand Down
1 change: 1 addition & 0 deletions mods/_fd/ascent/_ascent.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "code/culture_ascent.dm"
#include "code/location_ascent.dm"
#include "code/religion_ascent.dm"
#include "code/yummy_organs.dm"
#include "code/~ascent.dm"

#endif
37 changes: 36 additions & 1 deletion mods/_fd/ascent/code/ascent_species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,18 @@
/datum/mob_descriptor/body_length = -2
)

default_emotes = list(
/singleton/emote/audible/ascent_hiss,
/singleton/emote/audible/ascent_purr,
/singleton/emote/audible/ascent_snarl,
/singleton/emote/visible/ascent_dazzle,
/singleton/emote/visible/ascent_flicker,
/singleton/emote/visible/ascent_glimmer,
/singleton/emote/visible/ascent_glint,
/singleton/emote/visible/ascent_pulse,
/singleton/emote/visible/ascent_shine,
)

pain_emotes_with_pain_level = list(
list(/singleton/emote/visible/ascent_shine, /singleton/emote/visible/ascent_dazzle) = 80,
list(/singleton/emote/visible/ascent_glimmer, /singleton/emote/visible/ascent_pulse) = 50,
Expand Down Expand Up @@ -254,6 +266,18 @@
TAG_RELIGION = RELIGION_KHARMAANI
)

default_emotes = list(
/singleton/emote/audible/ascent_hiss,
/singleton/emote/audible/ascent_purr,
/singleton/emote/audible/ascent_snarl,
/singleton/emote/visible/ascent_dazzle,
/singleton/emote/visible/ascent_flicker,
/singleton/emote/visible/ascent_glimmer,
/singleton/emote/visible/ascent_glint,
/singleton/emote/visible/ascent_pulse,
/singleton/emote/visible/ascent_shine,
)

/datum/species/nabber/monarch_worker/skills_from_age(age)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ты уверен что Монархи должны светится?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Хорошее замечание, я был уверен что Монархи имели у себя язык свечения восхождения, но теперь когда я смотрю туда вновь - даже в описании у нонвокала уточнено, что он исключительно для Кхаармани
сейчас изменим

. = 0

Expand Down Expand Up @@ -323,14 +347,25 @@
/datum/mob_descriptor/body_length = -1
)


force_cultural_info = list(
TAG_CULTURE = CULTURE_ASCENT,
TAG_HOMEWORLD = HOME_SYSTEM_KHARMAANI,
TAG_FACTION = FACTION_ASCENT_SERPENTID,
TAG_RELIGION = RELIGION_KHARMAANI
)

default_emotes = list(
/singleton/emote/audible/ascent_hiss,
/singleton/emote/audible/ascent_purr,
/singleton/emote/audible/ascent_snarl,
/singleton/emote/visible/ascent_dazzle,
/singleton/emote/visible/ascent_flicker,
/singleton/emote/visible/ascent_glimmer,
/singleton/emote/visible/ascent_glint,
/singleton/emote/visible/ascent_pulse,
/singleton/emote/visible/ascent_shine,
)

/datum/species/nabber/monarch_queen/New()
equip_adjust = list(
slot_belt_str = list(
Expand Down
32 changes: 32 additions & 0 deletions mods/_fd/ascent/code/yummy_organs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/obj/item/reagent_containers/food/snacks/organ/use_before(mob/M as mob, mob/user as mob)
if (!istype(M, /mob/living/carbon))
return FALSE
if (!reagents || !reagents.total_volume)
to_chat(user, SPAN_DANGER("None of [src] left!"))
qdel(src)
return TRUE
if (!is_open_container())
to_chat(user, SPAN_NOTICE("\The [src] isn't open!"))
return TRUE

var/mob/living/carbon/C = M
var/fullness = C.get_fullness()
if(istype(C,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
to_chat(user, "Where do you intend to put \the [src]? You don't have a mouth!")
return TRUE
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, SPAN_WARNING("\The [blocked] is in the way!"))
return TRUE

if(fullness > 550)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)//puts a limit on how fast people can eat/drink things
to_chat(C, SPAN_DANGER("You cannot force any more of [src] to go down your throat."))
return TRUE

if(is_type_in_list(M, ALL_ASCENT_SPECIES))
reagents.del_reagent(/datum/reagent/toxin)

return ..()
Comment on lines +29 to +32
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И так, вернулся к этому еще раз. И заметил подобное.
Уверен, что стоит давать Монархам - иммунитет к токсинам?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Попинывай меня активнее)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Иммунитет будет лишь от токсинов в органах, которые мешают рп хищным расам есть мясо

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Подозреваю что оно так же будет убирать в-принципе яд, однако это лишь подозрения, которые мне лень проверять.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мимо. var/reagents содержит конкретно те реагенты, которые передаются этим проком от еды к человеку

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не мимо. Реагенты могут содержать яды не связанные с токсинами органов, связанные с отсутствия каннибализма. Хотя... Я не уверен - пойдет ли дальше по сабтайпам.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

нормально, продегустировал форон из чужой руки :D
На самом деле я могу с уверенностью сказать, что любой, даже самый отбитый хищник сможет обглодать мясо не съев токсичные его части, и это при условии что орган вообще будет содержать токсины

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А кто говорил, что я не буду подкладывать во все мясо - токсичные части?

Loading