diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm
index dca96ba8d47..f6f9e60739b 100644
--- a/code/modules/clothing/spacesuits/void/void_vr.dm
+++ b/code/modules/clothing/spacesuits/void/void_vr.dm
@@ -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()
\ No newline at end of file
diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index b0ba0a50c2a..0e20458291a 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -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")
\ No newline at end of file
+"his", "ing", "ion", "ith", "not", "ome", "oul", "our", "sho", "ted", "ter", "tha", "the", "thi")
diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm
index d349a2cc51b..fceb30b8220 100644
--- a/code/modules/mob/language/station_vr.dm
+++ b/code/modules/mob/language/station_vr.dm
@@ -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"
diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm
index 436ff01784d..6074934cec2 100644
--- a/code/modules/mob/living/carbon/human/species/station/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm
@@ -102,4 +102,4 @@
default_language = "Stok"
flesh_color = "#34AF10"
base_color = "#066000"
- reagent_tag = IS_UNATHI
\ No newline at end of file
+ reagent_tag = IS_UNATHI
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 9830784f728..0bd8a39c47b 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -289,4 +289,4 @@
else
qdel(D)
- H.visible_message("\The [H] splits apart with a wet slithering noise!")
\ No newline at end of file
+ H.visible_message("\The [H] splits apart with a wet slithering noise!")
diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
index 8a2480556f0..64c42bb5c0d 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm
@@ -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
diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi
index 599f248db03..8ce5f3cc20e 100644
Binary files a/icons/mob/species/vulpkanin/helmet.dmi and b/icons/mob/species/vulpkanin/helmet.dmi differ
diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi
index d6baae8ab67..ab7c0866bd2 100644
Binary files a/icons/mob/species/vulpkanin/mask.dmi and b/icons/mob/species/vulpkanin/mask.dmi differ
diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi
index 31b6d96f4cd..c5fcba20770 100644
Binary files a/icons/mob/species/vulpkanin/suit.dmi and b/icons/mob/species/vulpkanin/suit.dmi differ
diff --git a/icons/mob/species/vulpkanin/tail.dmi b/icons/mob/species/vulpkanin/tail.dmi
index 7b73f634d43..56a7dd982a5 100644
Binary files a/icons/mob/species/vulpkanin/tail.dmi and b/icons/mob/species/vulpkanin/tail.dmi differ
diff --git a/icons/obj/clothing/species/vulpkanin/hats.dmi b/icons/obj/clothing/species/vulpkanin/hats.dmi
new file mode 100644
index 00000000000..15f8ef09207
Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/hats.dmi differ
diff --git a/icons/obj/clothing/species/vulpkanin/suits.dmi b/icons/obj/clothing/species/vulpkanin/suits.dmi
new file mode 100644
index 00000000000..164a8247e5a
Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/suits.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index 2385279b1df..6ca09fc131c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -722,7 +722,6 @@
#include "code\game\objects\items\weapons\tape.dm"
#include "code\game\objects\items\weapons\teleportation.dm"
#include "code\game\objects\items\weapons\tools.dm"
-#include "code\game\objects\items\weapons\towels.dm"
#include "code\game\objects\items\weapons\traps.dm"
#include "code\game\objects\items\weapons\trays.dm"
#include "code\game\objects\items\weapons\weaponry.dm"
@@ -1193,7 +1192,6 @@
#include "code\modules\events\event_manager.dm"
#include "code\modules\events\gravity.dm"
#include "code\modules\events\grid_check.dm"
-#include "code\modules\events\ian_storm_vr.dm"
#include "code\modules\events\infestation.dm"
#include "code\modules\events\ion_storm.dm"
#include "code\modules\events\meteors.dm"