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

Makes positronics able to become human'ish #62

Merged
merged 2 commits into from
Nov 2, 2024
Merged

Makes positronics able to become human'ish #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
937c0a3
Makes positronics able to become human'ish
CheBuRek017 Nov 1, 2024
8d15d99
Update examine.dm
CheBuRek017 Nov 2, 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
11 changes: 9 additions & 2 deletions code/modules/mob/living/carbon/human/examine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,18 @@
var/is_synth = isSynthetic()
if(!(skipjumpsuit && skipface))
var/species_name = "\improper "
if(is_synth && species.cyborg_noun)
// [FD-EDIT]
var/s_flesh_colour = species.get_flesh_colour(src)
if(organs_by_name[BP_HEAD]?.model == "Vey-Med")
species_name += "Human"
s_flesh_colour = "#ffc896"
else if(is_synth && species.cyborg_noun)
species_name += "[species.cyborg_noun] [species.get_bodytype(src)]"
else
species_name += "[species.name]"
msg += ", <b>[SPAN_COLOR(species.get_flesh_colour(src), "\a [species_name]!")]</b>[(user.can_use_codex() && SScodex.get_codex_entry(get_codex_value())) ? SPAN_NOTICE(" \[<a href='?src=\ref[SScodex];show_examined_info=\ref[src];show_to=\ref[user]'>?</a>\]") : ""]"
//msg += ", <b>[SPAN_COLOR(species.get_flesh_colour(src), "\a [species_name]!")]</b>[(user.can_use_codex() && SScodex.get_codex_entry(get_codex_value())) ? SPAN_NOTICE(" \[<a href='?src=\ref[SScodex];show_examined_info=\ref[src];show_to=\ref[user]'>?</a>\]") : ""]"
msg += ", <b>[SPAN_COLOR(s_flesh_colour, "\a [species_name]!")]</b>[(user.can_use_codex() && SScodex.get_codex_entry(get_codex_value())) ? SPAN_NOTICE(" \[<a href='?src=\ref[SScodex];show_examined_info=\ref[src];show_to=\ref[user]'>?</a>\]") : ""]"
// [/FD-EDIT]

var/extra_species_text = species.get_additional_examine_text(src)
if(extra_species_text)
Expand Down
15 changes: 14 additions & 1 deletion mods/_fd/fd_species/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ ID мода: FD_SPECIES

- Мулов

Убирает ограничения для:

- ИПС (Веймед)

Маскирует веймед-ИПС под людей
<!--
Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
А также любая полезная информация.
Expand All @@ -43,6 +48,8 @@ ID мода: FD_SPECIES
- `code\modules\species\station\station.dm`: `var/spawn_flags`
- `mods\tajara\code\datum\species.dm`: `var/spawn_flags`
- `code\modules\species\station\human_subspecies.dm`: `var/spawn_flags`

- `code\modules\mob\living\carbon\human\examine.dm`: `proc/examine`
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Expand All @@ -53,7 +60,12 @@ ID мода: FD_SPECIES

### Оверрайды

Отсутствуют
- `code\modules\organs\robolimbs.dm`: `var/species_cannot_use`
- `mods\ipc_mods\code\machine.dm`: `var/genders`, `var/appearance_flags`
- `code\modules\sprite_accessories\_accessory.dm`: `var/species_allowed`
- `code\modules\sprite_accessories\_accessory_hair.dm`: `var/species_allowed`
- `code\modules\sprite_accessories\accessory_human.dm`: `var/species_allowed`
- `code\modules\sprite_accessories\accessory_hair_fade.dm`: `var/species_allowed`
<!--
Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
Здесь указываются оверрайды в твоём моде и папке `_master_files`
Expand Down Expand Up @@ -85,6 +97,7 @@ ID мода: FD_SPECIES
### "Авторы:"

Chaplain Maximum
CheBuRek017 & XeroXOffice & xDanilcusx
<!--
Здесь находится твой никнейм
Если работал совместно - никнеймы тех, кто помогал.
Expand Down
2 changes: 2 additions & 0 deletions mods/_fd/fd_species/_fd_species.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

#include "whitelist.dm"

#include "shells.dm"

#endif
18 changes: 18 additions & 0 deletions mods/_fd/fd_species/shells.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/datum/robolimb/veymed
species_cannot_use = list()

/datum/species/machine
genders = list(NEUTER, MALE, FEMALE, PLURAL)
appearance_flags = SPECIES_APPEARANCE_HAS_HAIR_COLOR | SPECIES_APPEARANCE_HAS_UNDERWEAR | SPECIES_APPEARANCE_HAS_EYE_COLOR //IPCs can wear undies too :(

/datum/sprite_accessory
species_allowed = list(SPECIES_HUMAN, SPECIES_IPC)

/datum/sprite_accessory/hair/bald
species_allowed = list(SPECIES_HUMAN,SPECIES_UNATHI,SPECIES_VOX,SPECIES_IPC)

/datum/sprite_accessory/marking/human
species_allowed = list(SPECIES_HUMAN, SPECIES_IPC)

/datum/sprite_accessory/marking/hair_fade
species_allowed = list(SPECIES_HUMAN, SPECIES_IPC)