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.

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

добавляет играбельную расу вульпканин #11753

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/language.dm
Expand Up @@ -14,6 +14,7 @@
#define LANGUAGE_ROOTSPEAK "Rootspeak"
#define LANGUAGE_ROOTSONG "Rootsong"
#define LANGUAGE_SOLCOMMON "Sol Common"
#define LANGUAGE_CANILUNZT "Canilunzt"
#define LANGUAGE_TRINARY "Trinary"
#define LANGUAGE_TRADEBAND "Tradeband"
#define LANGUAGE_GUTTER "Gutter"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/mob.dm
Expand Up @@ -85,6 +85,7 @@
#define IPC "Machine"
#define VOX "Vox"
#define VOX_ARMALIS "Vox Armalis"
#define VULPKANIN "Vulpkanin"
#define ABDUCTOR "Abductor"
#define SKELETON "Skeleton"
#define SKELETON_UNATHI "Skeleton Unathi"
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/database.dm
Expand Up @@ -19,4 +19,4 @@ var/global/DBConnection/dbcon = new()
// Xeno/role whitelist database ( code/modules/admin/whitelist.dm )
//
var/global/list/role_whitelist // cache of all ckeys and their roles
var/global/list/whitelisted_roles = list("unathi", "tajaran", "skrell", "diona", "machine", "vox", "ian") // Case important, everything must be in lowercase.
var/global/list/whitelisted_roles = list("unathi", "tajaran", "skrell", "diona", "machine", "vox", "vulpkanin", "ian") // Case important, everything must be in lowercase.
2 changes: 2 additions & 0 deletions code/datums/outfits/nuclear.dm
Expand Up @@ -45,6 +45,8 @@
/datum/outfit/nuclear/skrell_equip()
backpack_contents += list(/obj/item/device/modkit/skrell)

/datum/outfit/nuclear/vulpkanin_equip()

/datum/outfit/nuclear/vox_equip()
backpack_contents += list(/obj/item/device/modkit/vox)
l_hand = /obj/item/weapon/tank/nitrogen
Expand Down
3 changes: 3 additions & 0 deletions code/datums/outfits/outfit.dm
Expand Up @@ -116,6 +116,9 @@
/datum/outfit/proc/skrell_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
return

/datum/outfit/proc/vulpkanin_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
return

/datum/outfit/proc/vox_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
return

Expand Down
2 changes: 1 addition & 1 deletion code/datums/spells/lighting_shock.dm
Expand Up @@ -17,7 +17,7 @@
/obj/effect/proc_holder/spell/targeted/lighting_shock/atom_init()
. = ..()
if(!compatible_mobs)
compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/monkey/punpun, /mob/living/carbon/human/tajaran, /mob/living/carbon/human/skrell, /mob/living/carbon/human/unathi, /mob/living/carbon/human/diona, /mob/living/carbon/human/abductor, /mob/living/carbon/human/golem, /mob/living/carbon/human/vox)
compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/monkey/punpun, /mob/living/carbon/human/tajaran, /mob/living/carbon/human/skrell, /mob/living/carbon/human/unathi, /mob/living/carbon/human/diona, /mob/living/carbon/human/abductor, /mob/living/carbon/human/golem, /mob/living/carbon/human/vox, /mob/living/carbon/human/vulpkanin)

/obj/effect/proc_holder/spell/targeted/lighting_shock/cast(list/targets, mob/user = usr)
if(!targets.len)
Expand Down
10 changes: 10 additions & 0 deletions code/modules/mob/language.dm
Expand Up @@ -229,6 +229,16 @@
key = list("p", "з")
syllables = list("000", "111", "222", "001", "010", "100", "002", "020", "200", "011", "101", "110", "022", "202", "220", "112", "121", "211", "122", "212", "221", "012", "021", "120", "210", "102", "201")

/datum/language/vulpkanin
name = LANGUAGE_CANILUNZT
desc = "The sonorous and melodic language of one of the most educated species in the galaxy."
speech_verb = "woofs"
ask_verb = "barks"
exclaim_verb = "roars"
colour = "vulpkanin"
key = list("7")
syllables = list("rrr", "rwaar", "uwu", "vore", "woaf", "owo")

// Galactic common languages (systemwide accepted standards).
/datum/language/trader
name = LANGUAGE_TRADEBAND
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/human.dm
Expand Up @@ -114,6 +114,9 @@
/mob/living/carbon/human/diona/atom_init(mapload)
. = ..(mapload, DIONA)

/mob/living/carbon/human/vulpkanin/atom_init(mapload)
. = ..(mapload, VULPKANIN)

/mob/living/carbon/human/podman/atom_init(mapload)
. = ..(mapload, PODMAN)

Expand Down
47 changes: 47 additions & 0 deletions code/modules/mob/living/carbon/species.dm
Expand Up @@ -461,6 +461,7 @@
taste_sensitivity = TASTE_SENSITIVITY_DULL

siemens_coefficient = 1.3 // Because they are wet and slimy.
Fx43t2nm marked this conversation as resolved.
Show resolved Hide resolved

has_gendered_icons = FALSE

flags = list(
Expand Down Expand Up @@ -499,6 +500,52 @@
/datum/species/skrell/call_species_equip_proc(mob/living/carbon/human/H, datum/outfit/O)
return O.skrell_equip(H)

/datum/species/vulpkanin
name = VULPKANIN
icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
language = LANGUAGE_CANILUNZT
primitive = /mob/living/simple_animal/corgi/puppy
unarmed_type = /datum/unarmed_attack/claws
dietflags = DIET_MEAT
taste_sensitivity = TASTE_SENSITIVITY_SHARP
darksight = 8
nighteyes = 1

burn_mod = 1.50
has_gendered_icons = FALSE

flags = list(
IS_WHITELISTED = TRUE
,HAS_LIPS = TRUE
,HAS_UNDERWEAR = TRUE
,HAS_SKIN_COLOR = TRUE
,FACEHUGGABLE = TRUE
,HAS_HAIR_COLOR = TRUE
,IS_SOCIAL = TRUE
)

has_organ = list(
O_HEART = /obj/item/organ/internal/heart,
O_BRAIN = /obj/item/organ/internal/brain,
O_EYES = /obj/item/organ/internal/eyes,
O_LUNGS = /obj/item/organ/internal/lungs,
O_LIVER = /obj/item/organ/internal/liver,
O_KIDNEYS = /obj/item/organ/internal/kidneys
)

flesh_color = "#cf6413"
base_color = "#8a420b"

min_age = 18
max_age = 80

is_common = TRUE

skeleton_type = SKELETON_TAJARAN

/datum/species/vulpkanin/call_species_equip_proc(mob/living/carbon/human/H, datum/outfit/O)
return O.vulpkanin_equip(H)

/datum/species/vox
name = VOX
icobase = 'icons/mob/human_races/r_vox.dmi'
Expand Down
Binary file added icons/mob/human_races/r_vulpkanin.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-dark.scss
Expand Up @@ -179,6 +179,7 @@ h2.alert {
.ipc {color: #dadada;}
.syndcode {color: #ff4141;}
.replicator {color: #a8dff0;}
.vulpkanin {color: #b06c13;}

.interface {
color: #750e75;
Expand Down
2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.css

Large diffs are not rendered by default.