also fix that

This commit is contained in:
Kashargul
2024-12-02 23:22:21 +01:00
parent ed1019c70a
commit 90c2d09e8e
15 changed files with 23 additions and 18 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ var/global/list/env_messages = list()
mouse_opacity = TRUE
anchored = TRUE
var/list/message_list = list()
var/combined_message = "You should not see this"
var/combined_message = DEVELOPER_WARNING_NAME
/obj/effect/env_message/Initialize(mapload)
.=..()
@@ -6,14 +6,14 @@
////////////////////////////
*/
/datum/sprite_accessory/ears
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/human_races/sprite_accessories/ears.dmi'
do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color
color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1
var/extra_overlay // Icon state of an additional overlay to blend in.
var/extra_overlay2
var/desc = "You should not see this..."
var/desc = DEVELOPER_WARNING_NAME
em_block = TRUE
//species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files
@@ -6,7 +6,7 @@
////////////////////////////
*/
/datum/sprite_accessory/ears
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/ears_vr.dmi'
do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW, SPECIES_ALTEVIAN, SPECIES_LLEILL, SPECIES_HANNER) //This lets all races use
@@ -6,7 +6,7 @@
////////////////////////////
*/
/datum/sprite_accessory/tail
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/human_races/sprite_accessories/tails.dmi'
do_colouration = 0 //Set to 1 to enable coloration using the tail color.
@@ -16,7 +16,7 @@
var/extra_overlay2 //Tertiary.
var/show_species_tail = 0 // If false, do not render species' tail.
var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it
var/desc = "You should not see this..."
var/desc = DEVELOPER_WARNING_NAME
var/ani_state // State when wagging/animated
var/extra_overlay_w // Wagging state for extra overlay
var/extra_overlay2_w // Tertiary wagging.
@@ -6,7 +6,7 @@
////////////////////////////
*/
/datum/sprite_accessory/tail
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/tails_vr.dmi'
var/offset_x = 0
var/offset_y = 0
@@ -1439,7 +1439,7 @@
//LONG TAILS ARE NOT TAUR BUTTS >:O
/datum/sprite_accessory/tail/longtail
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/taurs_vr.dmi'
offset_x = -16
do_colouration = 1 // Yes color, using tail color
@@ -128,7 +128,7 @@
// Taur sprites are now a subtype of tail since they are mutually exclusive anyway.
/datum/sprite_accessory/tail/taur
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/human_races/sprite_accessories/taurs.dmi'
do_colouration = 1 // Yes color, using tail color
color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY
@@ -9,7 +9,7 @@
// Taur sprites are now a subtype of tail since they are mutually exclusive anyway.
/datum/sprite_accessory/tail/taur
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/taurs_vr.dmi'
do_colouration = 1 // Yes color, using tail color
color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY
@@ -575,13 +575,13 @@
// No, this isn't a character creation option, but... I guess in the future it could be, if anyone wants that?
/datum/sprite_accessory/hair_accessory
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/hair_accessories_vr.dmi'
do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color
var/ignores_lighting = 0 // Whether or not this hair accessory will ignore lighting and glow in the dark.
color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1
var/desc = "You should not see this..."
var/desc = DEVELOPER_WARNING_NAME
/datum/sprite_accessory/hair_accessory/verie_hair_glow
name = "veries hair glow"
@@ -6,7 +6,7 @@
////////////////////////////
*/
/datum/sprite_accessory/wing
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/human_races/sprite_accessories/wings.dmi'
do_colouration = 0 //Set to 1 to enable coloration using the tail color.
@@ -16,7 +16,7 @@
var/extra_overlay2 //Tertiary.
var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it. If the clothing is bulky enough to hide a tail, it should also hide wings.
// var/show_species_tail = 1 // Just so // TODO - Seems not needed ~Leshana
var/desc = "You should not see this..."
var/desc = DEVELOPER_WARNING_NAME
var/ani_state // State when flapping/animated
var/extra_overlay_w // Flapping state for extra overlay
var/extra_overlay2_w
@@ -2,7 +2,7 @@
/datum/sprite_accessory/wing/large
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/wings96_vr.dmi'
wing_offset = 32
@@ -6,7 +6,7 @@
////////////////////////////
*/
/datum/sprite_accessory/wing
name = "You should not see this..."
name = DEVELOPER_WARNING_NAME
icon = 'icons/mob/vore/wings_vr.dmi'
do_colouration = 0 //Set to 1 to enable coloration using the tail color.
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW, SPECIES_ALTEVIAN, SPECIES_LLEILL, SPECIES_HANNER) //This lets all races use
@@ -606,6 +606,8 @@
// VOREStation Add - Ears/Tails/Wings
/datum/tgui_module/appearance_changer/proc/can_use_sprite(datum/sprite_accessory/X, mob/living/carbon/human/target, mob/user)
if(X.name == DEVELOPER_WARNING_NAME)
return FALSE
if(!isnull(X.species_allowed) && !(target.species.name in X.species_allowed) && (!istype(target.species, /datum/species/custom))) // Letting custom species access wings/ears/tails.
return FALSE