cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finishes this PR

Browse Source
This commit is contained in:
Unknown
2020-03-17 14:00:02 -04:00
parent a6a12b3a9e
commit c960a9ec30
7 changed files with 96 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__defines/mobs_vr.dm
View File

@@ -39,3 +39,6 @@
//event species
#define SPECIES_WEREBEAST "Werebeast"
#define SPECIES_SHADEKIN "Shadekin"
//custom species base sprites
#define SPECIES_FENNEC "Fennec"
#define SPECIES_XENOHYBRID "Xenohybrid"

3
code/_helpers/global_lists_vr.dm
View File

@@ -470,6 +470,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
// Custom species icon bases
var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //Just ones that won't work well.
var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID) //Include these anyway
for(var/species_name in GLOB.playable_species)
if(species_name in blacklisted_icons)
continue
@@ -477,5 +478,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
if(S.spawn_flags & SPECIES_IS_WHITELISTED)
continue
custom_species_bases += species_name
for(var/species_name in whitelisted_icons)
custom_species_bases += species_name
return 1 // Hooks must return 1

4
code/game/machinery/suit_storage_unit.dm
View File

@@ -588,7 +588,7 @@
//Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot") //VORESTATION EDIT
//Species that the suits can be configured to fit.
var/list/species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan", "Rapala") //VORESTATION EDIT
var/list/species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_ZORREN_HIGH) //VORESTATION EDIT
var/target_department
var/target_species
@@ -767,7 +767,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs.
to_chat(user, "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>")
departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring")
species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan", "Rapala") //VORESTATION EDIT
species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_ZORREN_HIGH) //VORESTATION EDIT
emagged = 1
safeties = 0

6
code/modules/clothing/clothing.dm
View File

@@ -124,6 +124,12 @@
switch(target_species)
if(SPECIES_SKRELL)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN) //skrell helmets fit humans too
//VOREStation Add Start
if(SPECIES_UNATHI)
species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID)
if(SPECIES_ZORREN_HIGH)
species_restricted = list(SPECIES_ZORREN_HIGH, SPECIES_FENNEC)
//VOREStation Add End
else
species_restricted = list(target_species)

21
code/modules/clothing/spacesuits/void/void_vr.dm
View File

@@ -14,11 +14,9 @@
"Nevrean" = 'icons/mob/species/nevrean/helmet_vr.dmi',
"Akula" = 'icons/mob/species/akula/helmet_vr.dmi',
"Sergal" = 'icons/mob/species/sergal/helmet_vr.dmi',
"Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi',
"Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi',
"Zorren" = 'icons/mob/species/fox/helmet_vr.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Promethean" = 'icons/mob/species/skrell/helmet.dmi',
"Xenomorph Hybrid" = 'icons/mob/species/unathi/helmet.dmi'
"Promethean" = 'icons/mob/species/skrell/helmet.dmi'
)
sprite_sheets_obj = list(
@@ -29,11 +27,9 @@
"Nevrean" = 'icons/obj/clothing/species/nevrean/hats.dmi',
"Akula" = 'icons/obj/clothing/species/akula/hats.dmi',
"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',
"Zorren" = 'icons/obj/clothing/species/fox/hats.dmi',
"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi',
"Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi',
"Xenomorph Hybrid" = 'icons/obj/clothing/species/unathi/hats.dmi'
"Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi'
)
/obj/item/clothing/suit/space/void
@@ -45,11 +41,9 @@
"Nevrean" = 'icons/mob/species/nevrean/suit_vr.dmi',
"Akula" = 'icons/mob/species/akula/suit_vr.dmi',
"Sergal" = 'icons/mob/species/sergal/suit_vr.dmi',
"Flatland Zorren" = 'icons/mob/species/fennec/suit_vr.dmi',
"Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi',
"Zorren" = 'icons/mob/species/fox/suit_vr.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Promethean" = 'icons/mob/species/skrell/suit.dmi',
"Xenomorph Hybrid" = 'icons/mob/species/unathi/suit.dmi'
"Promethean" = 'icons/mob/species/skrell/suit.dmi'
)
@@ -62,8 +56,7 @@
"Nevrean" = 'icons/obj/clothing/species/nevrean/suits.dmi',
"Akula" = 'icons/obj/clothing/species/akula/suits.dmi',
"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',
"Zorren" = 'icons/obj/clothing/species/fox/suits.dmi',
"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi',
"Promethean" = 'icons/obj/clothing/species/skrell/suits.dmi'
)

4
code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm
View File

@@ -8,8 +8,8 @@
valid_transform_species = list(
"Human", "Unathi", "Tajara", "Skrell",
"Diona", "Teshari", "Monkey","Sergal",
"Akula","Nevrean","Highlander Zorren",
"Flatland Zorren", "Vulpkanin", "Vasilissan",
"Akula","Nevrean","Zorren",
"Fennec", "Vulpkanin", "Vasilissan",
"Rapala", "Neaera", "Stok", "Farwa", "Sobaka",
"Wolpin", "Saru", "Sparra")

74
code/modules/mob/living/carbon/human/species/station/station_vr.dm
View File

@@ -487,4 +487,76 @@ datum/species/harpy
return SPECIES_SHADEKIN
/datum/species/shadekin/can_breathe_water()
return TRUE //they dont quite breathe
return TRUE //they dont quite breathe
//These species are not really species but are just there for custom species selection
/datum/species/fl_zorren
name = SPECIES_FENNEC
name_plural = "Fennec"
icobase = 'icons/mob/human_races/r_fennec_vr.dmi'
deform = 'icons/mob/human_races/r_def_fennec.dmi'
tail = "tail"
icobase_tail = 1
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_TERMINUS)
name_language = LANGUAGE_TERMINUS
inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds)
min_age = 18
max_age = 80
//primitive_form = "" //We don't have fennec-monkey sprites.
spawn_flags = SPECIES_IS_RESTRICTED
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
flesh_color = "#AFA59E"
base_color = "#333333"
blood_color = "#240bc4"
color_mult = 1
inherent_verbs = list(/mob/living/proc/shred_limb)
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
"Your overheated skin itches."
)
/datum/species/xenohybrid
name = SPECIES_XENOHYBRID
name_plural = "Xenomorphs"
icobase = 'icons/mob/human_races/r_xenomorph.dmi'
deform = 'icons/mob/human_races/r_def_xenomorph.dmi'
tail = "tail"
icobase_tail = 1
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
darksight = 4 //Better hunters in the dark.
hunger_factor = 0.1 //In exchange, they get hungry a tad faster.
num_alternate_languages = 2
min_age = 18
max_age = 80
blurb = "Xenomorphs hybrids are a mixture of xenomorph DNA and some other humanoid species. \
Xenomorph hyrids mostly have had had their natural aggression removed due to the gene modification process \
although there are some exceptions, such as when they are harmed. Most xenomorph hybrids are female, due to their natural xenomorph genes, \
but there are multiple exceptions. All xenomorph hybrids have had their ability to lay eggs containing facehuggers \
removed if they had the ability to, although hybrids that previously contained this ability is extremely rare."
// No wiki page for xenohybrids at present
//primitive_form = "" //None for these guys
spawn_flags = SPECIES_IS_RESTRICTED
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
blood_color = "#12ff12"
flesh_color = "#201730"
base_color = "#201730"
heat_discomfort_strings = list(
"Your chitin feels extremely warm.",
"You feel uncomfortably warm.",
"Your chitin feels hot."
)
inherent_verbs = list(/mob/living/proc/shred_limb)