cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/vulparace'

Browse Source
This commit is contained in:
Poojawa
2016-05-30 09:33:53 -05:00
parent b8447c4b03 423a010eba
commit 9db78484d0
13 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/void/void_vr.dm
+6 -4
View File
@@ -29,7 +29,7 @@
"Sergal" = 'icons/obj/clothing/species/sergal/hats.dmi',
"Flatland Zorren" = 'icons/obj/clothing/species/fennec/hats.dmi',
"Highlander Zorren" = 'icons/obj/clothing/species/fox/hats.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)
/obj/item/clothing/suit/space/void
@@ -46,6 +46,8 @@
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
)
sprite_sheets_obj = list(
"Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm
"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm
@@ -56,12 +58,12 @@
"Sergal" = 'icons/obj/clothing/species/sergal/suits.dmi',
"Flatland Zorren" = 'icons/obj/clothing/species/fennec/suits.dmi',
"Highlander Zorren" = 'icons/obj/clothing/species/fox/suits.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi')
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)
// This is a hack to prevent the item_state variable on the suits from taking effect
// when the item is equipped in outer clothing slot.
// This variable is normally used to set the icon_override when the suit is refitted,
// however the species spritesheet now means we no longer need that anyway!
sprite_sheets_refit = list()
>>>>>>> refs/remotes/VOREStation/master
sprite_sheets_refit = list()
code/modules/mob/language/station.dm
+8 -8
View File
@@ -25,13 +25,13 @@
flags = WHITELISTED
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"
"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"
)
/datum/language/unathi/get_random_name()
@@ -202,4 +202,4 @@
"al", "an", "ar", "as", "at", "ea", "ed", "en", "er", "es", "ha", "he", "hi", "in", "is", "it",
"le", "me", "nd", "ne", "ng", "nt", "on", "or", "ou", "re", "se", "st", "te", "th", "ti", "to",
"ve", "wa", "all", "and", "are", "but", "ent", "era", "ere", "eve", "for", "had", "hat", "hen", "her", "hin",
"his", "ing", "ion", "ith", "not", "ome", "oul", "our", "sho", "ted", "ter", "tha", "the", "thi")
"his", "ing", "ion", "ith", "not", "ome", "oul", "our", "sho", "ted", "ter", "tha", "the", "thi")
code/modules/mob/language/station_vr.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/datum/language/vulpkanin
name = "Canilunzt"
desc = "The guttural language spoken and utilized by the inhabitants of Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements.Vulpkanin speak this language with ease."
desc = "The guttural language spoken and utilized by the inhabitants of Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements. Vulpkanin speak this language with ease."
speech_verb = "rrrfts"
ask_verb = "rurs"
exclaim_verb = "barks"
code/modules/mob/living/carbon/human/species/station/monkey.dm
+1 -1
View File
@@ -102,4 +102,4 @@
default_language = "Stok"
flesh_color = "#34AF10"
base_color = "#066000"
reagent_tag = IS_UNATHI
reagent_tag = IS_UNATHI
code/modules/mob/living/carbon/human/species/station/station.dm
+1 -1
View File
@@ -289,4 +289,4 @@
else
qdel(D)
H.visible_message("<span class='danger'>\The [H] splits apart with a wet slithering noise!</span>")
H.visible_message("<span class='danger'>\The [H] splits apart with a wet slithering noise!</span>")
code/modules/mob/living/carbon/human/species/station/station_vr.dm
+4 -4
View File
@@ -223,12 +223,12 @@
icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
deform = 'icons/mob/human_races/r_vulpkanin.dmi'
// path = /mob/living/carbon/human/vulpkanin
default_language = "Sol Common"
language = "Canilunzt"
// default_language = "Sol Common"
secondary_langs = list("Canilunzt")
name_language = "Canilunzt"
primitive_form = "Wolpin"
tail = "vulptail"
// tail_animation = 'icons/mob/species/vulpkanin/tail.dmi' // this will need to be changed.
icobase_tail = 1
tail_animation = 'icons/mob/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
darksight = 5 //worse than cats, but better than lizards. -- Poojawa
gluttonous = 1