forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Новая раса для TG SS220 Вульпочки (#267)
## About The Pull Request ПР добавляют новую [расу вульпканинов](https://wiki.ss220.club/index.php/%D0%92%D1%83%D0%BB%D1%8C%D0%BF%D0%BA%D0%B0%D0%BD%D0%B8%D0%BD), доступную при создании персонажа ![image](https://github.com/ss220club/Bandastation/assets/62209572/cf80ffd1-0143-4dea-a000-79b8c8b5fa3e) Игровые механики: - Возможность вынюхивать запахи людей, курение временно блокирует способность - Более высокий диапазон комфортных температур - Чувствительные ушки, получают больше урона но позволяют слышать шёпот - Белковая диета, может есть только мясо и некоторые молочные продукты - Быстрый метаболизм (модификатор голода х1.3) - Модификатор опьянения x2.5 - Модификатор зарплаты 0.8 Спрайты взяты с https://github.com/Alecksohs/ParadiseSpriteEdits, c некоторыми доработками и исправлениями Добавлен мутационный токсин, для превращения в вульпу: Делается в ксено, вколов в зелёный экстракт 5u Love ## Why It's Good For The Game На TG маленькое разнообразие рас, поэтому необходимо перенести расы с парадайза. Вульпкане одна из самых популярных и интересных рас с развитым лором и хорошим отыгрышем игроков. Добавление этой расы разнообразит игровой геймплей, создаст множество РП ситуаций и привлечет новых игроков. ![image](https://github.com/ss220club/Bandastation/assets/62209572/31e5822a-6823-4a90-962d-bc86d340d155) ## Changelog :cl: add: Новая раунд-стартовая раса "Вульпканин" tweak: ДНК для вульп add: Адаптивная одежда для расы "Вульпканин" add: Мутационный токсин для превращения в вульпу tweak: Печать хвоста и языка вульпы в limbgrower sound: Некоторые звуки которые издают вульпы /:cl: --------- Co-authored-by: Gaxeer <[email protected]> Co-authored-by: larentoun <[email protected]> Co-authored-by: dj-34 <[email protected]>
- Loading branch information
1 parent
1ec46dc
commit ce81e79
Showing
59 changed files
with
2,812 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+1.22 KB
...odules/unit_tests/screenshots/screenshot_humanoids__datum_species_vulpkanin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
3 changes: 3 additions & 0 deletions
3
modular_bandastation/_defines220/code/signals_mob/signals_mob_carbon.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,4 @@ | ||
// Signals for /mob/living/carbon | ||
|
||
// \modular_bandastation\species\code\human\species\species.dm | ||
#define COMSIG_CARBON_VULPKANIN_SNIFF "carbon_vulpkanin_sniff" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,4 @@ | |
|
||
#include "code/_emote_defines.dm" | ||
#include "code/emote_verbs.dm" | ||
#include "code/emotes.dm" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/datum/emote/living/sniffle | ||
key = "sniffle" | ||
key_third_person = "sniffles" | ||
name = "нюхать" | ||
message = "нюхает." | ||
message_mime = "бесшумно нюхает." | ||
message_param = "нюхает %t." | ||
|
||
/datum/emote/living/sniffle/get_sound(mob/living/user) | ||
if(user.gender == FEMALE) | ||
return 'modular_bandastation/emote_panel/audio/female/sniff_female.ogg' | ||
else | ||
return 'modular_bandastation/emote_panel/audio/male/sniff_male.ogg' | ||
|
||
// Vulpkanin | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE) | ||
var/organ = user.get_organ_slot(ORGAN_SLOT_TONGUE) | ||
if(istype(organ, /obj/item/organ/tongue/vulpkanin)) | ||
return ..() | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/howl | ||
name = "Выть" | ||
key = "howl" | ||
key_third_person = "howls" | ||
message = "воет." | ||
message_mime = "делает вид, что воет." | ||
message_param = "воет на %t." | ||
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE | ||
cooldown = 6 SECONDS | ||
sound = 'modular_bandastation/emote_panel/audio/howl.ogg' | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/growl | ||
name = "Рычать" | ||
key = "growl" | ||
key_third_person = "growls" | ||
message = "рычит." | ||
message_mime = "бусшумно рычит." | ||
message_param = "рычит на %t." | ||
cooldown = 2 SECONDS | ||
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/growl/get_sound(mob/living/user) | ||
return pick( | ||
'modular_bandastation/emote_panel/audio/growl1.ogg', | ||
'modular_bandastation/emote_panel/audio/growl2.ogg', | ||
'modular_bandastation/emote_panel/audio/growl3.ogg', | ||
) | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/purr | ||
name = "Урчать" | ||
key = "purr" | ||
key_third_person = "purrs" | ||
message = "урчит." | ||
message_param = "урчит на %t." | ||
emote_type = EMOTE_AUDIBLE | ||
vary = TRUE | ||
cooldown = 2 SECONDS | ||
sound = 'modular_bandastation/emote_panel/audio/purr.ogg' | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/bark | ||
name = "Гавкнуть" | ||
key = "bark" | ||
key_third_person = "bark" | ||
message = "гавкает." | ||
message_param = "гавкает на %t." | ||
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE | ||
vary = TRUE | ||
cooldown = 2 SECONDS | ||
sound = 'modular_bandastation/emote_panel/audio/bark.ogg' | ||
|
||
/datum/emote/living/carbon/human/vulpkanin/wbark | ||
name = "Гавкнуть дважды" | ||
key = "wbark" | ||
key_third_person = "wbark" | ||
message = "дважды гавкает." | ||
message_param = "дважды гавкает на %t." | ||
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE | ||
vary = TRUE | ||
cooldown = 2 SECONDS | ||
sound = 'modular_bandastation/emote_panel/audio/wbark.ogg' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
/datum/modpack/species | ||
name = "Species" | ||
desc = "Добавление архитектуры для новых видов и конфигурирования существующих." | ||
author = "Podvaldeda" | ||
author = "nlaysi, Podvaldeda" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,21 @@ | ||
#include "_species.dm" | ||
|
||
#include "code/_defines.dm" | ||
#include "code/language.dm" | ||
#include "code/dna.dm" | ||
|
||
#include "code/lizardperson/sprite_accesories/hair.dm" | ||
#include "code/human/carbon.dm" | ||
#include "code/human/sprite_accessories/vulpkanin.dm" | ||
#include "code/human/species_type/vulpkanin.dm" | ||
#include "code/human/sprite_accessories/hair.dm" | ||
#include "code/human/species/species.dm" | ||
#include "code/surgery/organs/external/vulpkanin_external.dm" | ||
#include "code/surgery/organs/internal/vulpkanin_internal.dm" | ||
#include "code/surgery/organs/limbgrower_designs.dm" | ||
#include "code/preferences/species_features/vulpkanin.dm" | ||
#include "code/surgery/bodyparts/vulpkanin_bodyparts.dm" | ||
#include "code/reagents/mutation.dm" | ||
|
||
#include "code/clothing/items.dm" | ||
#include "code/clothing/mod.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
#define SPECIES_VULPKANIN "vulpkanin" | ||
#define BUTT_SPRITE_VULPKANIN "vulpkanin" | ||
|
||
#define DEFAULT_SPRITE_LIST "default_sprites" | ||
|
||
#define DNA_VULPKANIN_BODY_MARKINGS DNA_FEATURE_BLOCKS + 1 | ||
#define DNA_VULPKANIN_HEAD_MARKINGS DNA_FEATURE_BLOCKS + 2 | ||
#define DNA_VULPKANIN_HEAD_ACCESSORIES DNA_FEATURE_BLOCKS + 3 | ||
#define DNA_VULPKANIN_TAIL DNA_FEATURE_BLOCKS + 4 | ||
#define DNA_VULPKANIN_TAIL_MARKINGS DNA_FEATURE_BLOCKS + 5 | ||
#define DNA_VULPKANIN_FACIAL_HAIR DNA_FEATURE_BLOCKS + 6 | ||
#define DNA_FURCOLOR_1 DNA_FEATURE_BLOCKS + 7 | ||
#define DNA_FURCOLOR_2 DNA_FEATURE_BLOCKS + 8 | ||
#define DNA_FURCOLOR_3 DNA_FEATURE_BLOCKS + 9 | ||
#define DNA_FURCOLOR_4 DNA_FEATURE_BLOCKS + 10 | ||
#define DNA_FURCOLOR_5 DNA_FEATURE_BLOCKS + 11 | ||
|
||
#define DNA_MODULAR_BLOCKS_COUNT 11 | ||
|
||
#define HEAD_VULPKANIN (1<<16) | ||
|
||
GLOBAL_LIST_INIT(first_names_female_vulp, world.file2list("strings/names/first_female_vulp.txt")) | ||
GLOBAL_LIST_INIT(first_names_male_vulp, world.file2list("strings/names/first_male_vulp.txt")) | ||
GLOBAL_LIST_INIT(last_names_vulp, world.file2list("strings/names/last_vulp.txt")) | ||
|
||
/datum/controller/subsystem/accessories | ||
var/list/vulpkanin_body_markings_list | ||
var/list/vulpkanin_head_markings_list | ||
var/list/vulpkanin_head_accessories_list | ||
var/list/tails_list_vulpkanin | ||
var/list/vulpkanin_tail_markings_list | ||
var/list/vulpkanin_facial_hair_list | ||
|
||
/datum/controller/subsystem/accessories/proc/init_modular_lists() | ||
vulpkanin_body_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_body_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] | ||
vulpkanin_head_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_head_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] | ||
vulpkanin_head_accessories_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_head_accessories, add_blank = TRUE)[DEFAULT_SPRITE_LIST] | ||
tails_list_vulpkanin = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/vulpkanin, add_blank = FALSE)[DEFAULT_SPRITE_LIST] | ||
vulpkanin_tail_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_tail_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST] | ||
vulpkanin_facial_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_facial_hair, add_blank = TRUE)[DEFAULT_SPRITE_LIST] | ||
|
||
/datum/controller/subsystem/accessories/PreInit() | ||
..() | ||
init_modular_lists() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/obj/item | ||
var/icon/worn_icon_species | ||
|
||
/obj/item/clothing/head/mod | ||
worn_icon_species = list( | ||
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi', | ||
) | ||
|
||
/obj/item/clothing/suit/mod | ||
worn_icon_species = list( | ||
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/vulp_modsuits.dmi', | ||
) | ||
|
||
/obj/item/mod/module | ||
worn_icon_species = list( | ||
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/modules_vulp.dmi', | ||
) | ||
|
||
/obj/item/clothing/suit | ||
worn_icon_species = list( | ||
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/suit.dmi', | ||
) | ||
|
||
/obj/item/clothing/head | ||
worn_icon_species = list( | ||
SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/clothing/head.dmi', | ||
) |
Oops, something went wrong.