diff --git a/code/__defines/mobs_vr.dm b/code/__defines/mobs_vr.dm index b9833c42c0..924b8b4814 100644 --- a/code/__defines/mobs_vr.dm +++ b/code/__defines/mobs_vr.dm @@ -38,10 +38,3 @@ #define SPECIES_WEREBEAST "Werebeast" #define SPECIES_SHADEKIN "Shadekin" -#define SPECIES_SHADEKIN_BLUE "Blue-eyed Shadekin" -#define SPECIES_SHADEKIN_RED "Red-eyed Shadekin" -#define SPECIES_SHADEKIN_YELLOW "Yellow-eyed Shadekin" -#define SPECIES_SHADEKIN_PURPLE "Purple-eyed Shadekin" -#define SPECIES_SHADEKIN_ORANGE "Orange-eyed Shadekin" -#define SPECIES_SHADEKIN_GREEN "Green-eyed Shadekin" -#define SPECIES_WEREBEAST "Werebeast" diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index efe8590d16..a3687b9b99 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -186,7 +186,7 @@ var/global/list/string_slot_flags = list( if(!(S.spawn_flags & SPECIES_IS_RESTRICTED)) playable_species += S.name - if((S.spawn_flags & SPECIES_IS_WHITELISTED) || (S.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit + if(S.spawn_flags & SPECIES_IS_WHITELISTED) whitelisted_species += S.name //Posters diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 5da656e95d..d57bd09558 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -407,7 +407,7 @@ var/global/list/contamination_colors = list("green", "beige", "pink") -//For the mechanic of leaving remains. Ones listed below are basically ones that got no bones. +//For the mechanic of leaving remains. Ones listed below are basically ones that got no bones or leave no trace after death. var/global/list/remainless_species = list(SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_ALRAUNE, @@ -427,13 +427,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, SPECIES_XENO_QUEEN, SPECIES_SHADOW, SPECIES_GOLEM, //Some special species that may or may not be ever used in event too, - SPECIES_SHADEKIN, - SPECIES_SHADEKIN_BLUE, - SPECIES_SHADEKIN_RED, - SPECIES_SHADEKIN_YELLOW, - SPECIES_SHADEKIN_PURPLE, - SPECIES_SHADEKIN_ORANGE, - SPECIES_SHADEKIN_GREEN) //Shadefluffers just poof away + SPECIES_SHADEKIN) //Shadefluffers just poof away /hook/startup/proc/init_vore_datum_ref_lists() var/paths @@ -479,7 +473,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, if(species_name in blacklisted_icons) continue var/datum/species/S = all_species[species_name] - if((S.spawn_flags & SPECIES_IS_WHITELISTED) || (S.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) + if(S.spawn_flags & SPECIES_IS_WHITELISTED) continue custom_species_bases += species_name diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 1270490517..9a13e066a5 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -40,7 +40,7 @@ var/list/whitelist = list() return 0 //The species isn't even whitelisted - if(!(species.spawn_flags & SPECIES_IS_WHITELISTED) && !(species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit + if(!(species.spawn_flags & SPECIES_IS_WHITELISTED)) return 1 //If we have a loaded file, search it diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 457f9800ea..e82daa1a8a 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -856,7 +856,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O dat += "
Unheard of on human stations." else dat += "
May be present on human stations." - if((current_species.spawn_flags & SPECIES_IS_WHITELISTED) || (current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit + if(current_species.spawn_flags & SPECIES_IS_WHITELISTED) dat += "
Whitelist restricted." if(!current_species.has_organ[O_HEART]) dat += "
Does not have a circulatory system." @@ -884,12 +884,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/restricted = 0 - - //VOREStation Addition begin - if(current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) - restricted = 3 - //VOREStation Addition end - else if(!(current_species.spawn_flags & SPECIES_CAN_JOIN)) //VOREStation Edit + if(!(current_species.spawn_flags & SPECIES_CAN_JOIN)) //VOREStation Edit restricted = 2 else if(!is_alien_whitelisted(preference_mob(),current_species)) restricted = 1 diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 2cdc692b0b..2c48b859a2 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -1,7 +1,3 @@ -/obj/item/clothing/under/harness - species_restricted = null - - /obj/item/clothing/var/hides_bulges = FALSE // OwO wats this? /obj/item/clothing/under/permit @@ -10,7 +6,6 @@ icon = 'icons/obj/card.dmi' icon_state = "guest" body_parts_covered = 0 - species_restricted = null sprite_sheets = list() diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 14f5f9c063..454ce677a8 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -156,8 +156,6 @@ continue if((current_species.spawn_flags & SPECIES_IS_WHITELISTED) && !is_alien_whitelisted(src, current_species)) continue - if((current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) && !is_alien_whitelisted(src, current_species)) //VOREStation Addition - continue //VOREStation Addition valid_species += current_species_name diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm index 1f197d9c28..d176d15d9b 100644 --- a/code/modules/mob/living/carbon/human/human_defines_vr.dm +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -10,14 +10,6 @@ var/ability_flags = 0 //Shadekin stoof var/sensorpref = 5 -/mob/living/carbon/human/proc/shadekin_get_eye_color() - var/datum/species/shadekin/SK = species - - if(!istype(SK)) - return 0 - - return SK.get_shadekin_eyecolor() - /mob/living/carbon/human/proc/shadekin_get_energy() var/datum/species/shadekin/SK = species diff --git a/code/modules/mob/living/carbon/human/species/shadekin/_defines.dm b/code/modules/mob/living/carbon/human/species/shadekin/_defines.dm index 1567134c4d..f24544e0b2 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/_defines.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/_defines.dm @@ -2,12 +2,5 @@ #define ONLY_WHILE_SHIFTED 2 #define SHIFTED_OR_NOT 3 -#define BLUE_EYES 1 -#define RED_EYES 2 -#define PURPLE_EYES 3 -#define YELLOW_EYES 4 -#define GREEN_EYES 5 -#define ORANGE_EYES 6 - #define AB_PHASE_SHIFTED 0x1 #define AB_SHADE_REGEN 0x2 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index 03ca43107c..471a601fd7 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -97,7 +97,6 @@ ) //SHADEKIN-UNIQUE STUFF GOES HERE - var/shadekin_eye_color = BLUE_EYES var/list/shadekin_abilities = list(/datum/power/shadekin/phase_shift, /datum/power/shadekin/regenerate_other, /datum/power/shadekin/create_shade) @@ -146,9 +145,6 @@ arguments = list() ) -/datum/species/shadekin/proc/get_shadekin_eyecolor() - return shadekin_eye_color - /datum/species/shadekin/proc/handle_shade(var/mob/living/carbon/human/H) //Shifted kin don't gain/lose energy (and save time if we're at the cap) var/darkness = 1 @@ -170,29 +166,9 @@ H.adjustFireLoss(-0.05) H.adjustBruteLoss(-0.05) H.adjustToxLoss(-0.05) - - switch(get_shadekin_eyecolor()) - //Blue has constant, steady (slow) regen and ignores darkness. - if(BLUE_EYES) - dark_gains = 0.5 - //Red has extremely tiny energy buildup in dark, none in light, and hunts for energy. - if(RED_EYES) - if(darkness >= 0.75) - dark_gains = 0.25 - //Purple eyes have moderate gains in darkness and loss in light. - if(PURPLE_EYES) - dark_gains = round((darkness - 0.5) * 2, 0.1) - //Yellow has extreme gains in darkness and loss in light. - if(YELLOW_EYES) - dark_gains = round((darkness - 0.5) * 4, 0.1) - //Similar to blues, but passive is less, and affected by dark - if(GREEN_EYES) - dark_gains = 0.25 - dark_gains += round((darkness - 0.5), 0.1) - //More able to get energy out of the dark, worse attack gains tho - if(ORANGE_EYES) - if(darkness >= 0.65) - dark_gains = 0.30 + dark_gains = 0.75 + else + dark_gains = 0.25 set_energy(H, get_energy(H) + dark_gains) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index 855acba0a7..90ddef030a 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -80,12 +80,7 @@ to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") //Affect nearby lights - var/sk_eyecolor = shadekin_get_eye_color() var/destroy_lights = 0 - if(sk_eyecolor == RED_EYES) - destroy_lights = 80 - if(sk_eyecolor == PURPLE_EYES) - destroy_lights = 25 for(var/obj/machinery/light/L in machines) if(L.z != z || get_dist(src,L) > 10) diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index cc00d70fc7..1d0a73d669 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -6,7 +6,6 @@ //This is for overriding tail rendering with a specific icon in icobase, for static //tails only, since tails would wag when dead if you used this var/icobase_tail = 0 - var/longtail = FALSE //This is so that if a race is using the chimera revive they can't use it more than once. //Shouldn't really be seen in play too often, but it's case an admin event happens and they give a non chimera the chimera revive. Only one person can use the chimera revive at a time per race. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index de4f0ba0dc..7ae3718027 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -898,12 +898,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() //This one is actually not that bad I guess. if(species_tail && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) var/icon/tail_s = get_tail_icon() - //VOREStation Edit start: SHADEKIN - if(species.longtail) - overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer, pixel_x = -16) - else - overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) // VOREStation Edit - Alt Tail Layer - //VOREStation Edit end: SHADEKIN + overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) // VOREStation Edit - Alt Tail Layer animate_tail_reset() //TODO: Is this the appropriate place for this, and not on species...? diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index b665c37640..4803a9e668 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -70,7 +70,7 @@ var/stock_bodyrecords_list_ui[0] for (var/N in all_species) var/datum/species/S = all_species[N] - if((S.spawn_flags & (SPECIES_WHITELIST_SELECTABLE|SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) != SPECIES_CAN_JOIN) continue + if((S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) != SPECIES_CAN_JOIN) continue stock_bodyrecords_list_ui += N if(stock_bodyrecords_list_ui.len) data["stock_bodyrecords"] = stock_bodyrecords_list_ui @@ -173,7 +173,7 @@ else if(href_list["view_stock_brec"]) var/datum/species/S = all_species[href_list["view_stock_brec"]] - if(S && (S.spawn_flags & (SPECIES_WHITELIST_SELECTABLE|SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) == SPECIES_CAN_JOIN) + if(S && (S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) == SPECIES_CAN_JOIN) // Generate body record from species! mannequin = new(null, S.name) mannequin.real_name = "Stock [S.name] Body"