cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 07:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for 585b02c325

Browse Source
This commit is contained in:
Roxy
2025-11-06 00:18:59 -05:00
parent 5faf4a23ad
commit eb6d02fdb0
18 changed files with 14 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/subsystem/sprite_accessories.dm
View File

@@ -86,6 +86,7 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
undershirt_m = undershirt_lists[MALE_SPRITE_LIST]
undershirt_f = undershirt_lists[FEMALE_SPRITE_LIST]
socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST]
// SKYRAT EDIT ADDITION START - Underwear/bra split
var/bra_lists = init_sprite_accessory_subtypes(/datum/sprite_accessory/bra)
bra_list = bra_lists[DEFAULT_SPRITE_LIST]
@@ -119,7 +120,7 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
feature_list[FEATURE_TAIL_MONKEY] = INIT_ACCESSORY(/datum/sprite_accessory/tails/monkey)
feature_list[FEATURE_TAIL_XENO] = INIT_ACCESSORY(/datum/sprite_accessory/tails/xeno)
/// This proc just intializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
/// This proc just initializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
/datum/controller/subsystem/accessories/proc/init_hair_gradients()
hair_gradients_list = list()
facial_hair_gradients_list = list()

2
code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
View File

@@ -122,7 +122,7 @@
///Return a dumb glob list for this specific feature (called from parse_sprite)
/datum/bodypart_overlay/mutant/proc/get_global_feature_list()
var/list/feature_list = SSaccessories.feature_list[feature_key]
var/list/feature_list = SSaccessories.sprite_accessories[feature_key] // BUBBER EDIT CHANGE - Customization - Original: var/list/feature_list = SSaccessories.feature_list[feature_key]
if(isnull(feature_list))
stack_trace("External organ has no feature list, it will render invisible")
return list()

6
code/modules/surgery/organs/external/tails.dm vendored
View File

@@ -147,16 +147,12 @@
/datum/bodypart_overlay/mutant/tail
layers = EXTERNAL_FRONT|EXTERNAL_BEHIND
dyable = TRUE
feature_key = FEATURE_TAIL_GENERIC
var/wagging = FALSE
/datum/bodypart_overlay/mutant/tail/get_base_icon_state()
return "[wagging ? "wagging_" : ""][sprite_datum.icon_state]" //add the wagging tag if we be wagging
// SKYRAT EDIT ADDITION - CUSTOMIZATION
/datum/bodypart_overlay/mutant/tail/get_global_feature_list()
return SSaccessories.sprite_accessories[FEATURE_TAIL_GENERIC]
// SKYRAT EDIT ADDITION END
/datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)

2
code/modules/surgery/organs/external/wings/functional_wings.dm vendored
View File

@@ -174,7 +174,7 @@
return ..()
*/
if(wings_open)
return SSaccessories.sprite_accessories[FEATURE_WINGS_OPEN]
return SSaccessories.sprite_accessories["wings_open"]
return SSaccessories.sprite_accessories[FEATURE_WINGS]
// SKYRAT EDIT ADDITION END
///Update our wingsprite to the open wings variant

2
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/monkey.dm
View File

@@ -5,7 +5,7 @@
/datum/species/monkey/randomize_features()
var/list/features = ..()
features[FEATURE_TAIL_GENERIC] = pick(SSaccessories.tails_list_monkey - list("None")) // No tail-less monkeys.
features[FEATURE_TAIL_GENERIC] = pick(SSaccessories.feature_list[FEATURE_TAIL_MONKEY] - list("None")) // No tail-less monkeys.
return features
/datum/species/monkey/prepare_human_for_preview(mob/living/carbon/human/monke)

2
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mushpeople.dm
View File

@@ -13,7 +13,7 @@
/datum/species/mush/randomize_features()
var/list/features = ..()
features[FEATURE_MUSH_CAP] = pick(SSaccessories.caps_list - list("None")) // No tail-less monkeys. // No cap-less mushpeople.
features[FEATURE_MUSH_CAP] = pick(SSaccessories.feature_list[FEATURE_MUSH_CAP] - list("None")) // No cap-less mushpeople.
return features
/datum/species/mush/prepare_human_for_preview(mob/living/carbon/human/shrooman)

3
modular_skyrat/modules/customization/modules/surgery/organs/cap.dm
View File

@@ -26,9 +26,6 @@
randomize_cap_color()
return draw_color
/datum/bodypart_overlay/mutant/mushroom_cap/get_global_feature_list()
return SSaccessories.sprite_accessories["caps"]
/datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
var/mob/living/carbon/human/human = bodypart_owner.owner
if(!human)

5
modular_skyrat/modules/customization/modules/surgery/organs/ears.dm
View File

@@ -15,7 +15,7 @@
/obj/item/organ/ears/fox
/datum/bodypart_overlay/mutant/ears
feature_key = "ears"
feature_key = FEATURE_EARS
layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND
color_source = ORGAN_COLOR_OVERRIDE
@@ -27,6 +27,3 @@
/datum/bodypart_overlay/mutant/ears/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/ears/get_global_feature_list()
return SSaccessories.sprite_accessories["ears"]

5
modular_skyrat/modules/customization/modules/surgery/organs/fluff.dm
View File

@@ -13,12 +13,9 @@
bodypart_overlay = /datum/bodypart_overlay/mutant/fluff
/datum/bodypart_overlay/mutant/fluff
feature_key = "fluff"
feature_key = FEATURE_FLUFF
layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT
color_source = ORGAN_COLOR_OVERRIDE
/datum/bodypart_overlay/mutant/fluff/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/fluff/get_global_feature_list()
return SSaccessories.sprite_accessories["fluff"]

3
modular_skyrat/modules/customization/modules/surgery/organs/frills.dm
View File

@@ -14,6 +14,3 @@
if(!human)
return TRUE
return !sprite_datum.is_hidden(human)
/datum/bodypart_overlay/mutant/frills/get_global_feature_list()
return SSaccessories.sprite_accessories["frills"]

5
modular_skyrat/modules/customization/modules/surgery/organs/moth_markings.dm
View File

@@ -13,12 +13,9 @@
bodypart_overlay = /datum/bodypart_overlay/mutant/moth_markings
/datum/bodypart_overlay/mutant/moth_markings
feature_key = "moth_markings"
feature_key = FEATURE_MOTH_MARKINGS
layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT | EXTERNAL_BEHIND
color_source = ORGAN_COLOR_OVERRIDE
/datum/bodypart_overlay/mutant/moth_markings/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/moth_markings/get_global_feature_list()
return SSaccessories.sprite_accessories["moth_markings"]

5
modular_skyrat/modules/customization/modules/surgery/organs/skrell_hair.dm
View File

@@ -14,12 +14,9 @@
use_mob_sprite_as_obj_sprite = TRUE
/datum/bodypart_overlay/mutant/skrell_hair
feature_key = "skrell_hair"
feature_key = FEATURE_SKRELL_HAIR
layers = EXTERNAL_FRONT | EXTERNAL_ADJACENT
color_source = ORGAN_COLOR_OVERRIDE
/datum/bodypart_overlay/mutant/skrell_hair/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/skrell_hair/get_global_feature_list()
return SSaccessories.sprite_accessories["skrell_hair"]

3
modular_skyrat/modules/customization/modules/surgery/organs/synth_antenna.dm
View File

@@ -20,6 +20,3 @@
/datum/bodypart_overlay/mutant/synth_antenna/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/synth_antenna/get_global_feature_list()
return SSaccessories.sprite_accessories[MUTANT_SYNTH_ANTENNA]

3
modular_skyrat/modules/customization/modules/surgery/organs/synth_screen.dm
View File

@@ -20,6 +20,3 @@
/datum/bodypart_overlay/mutant/synth_screen/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/synth_screen/get_global_feature_list()
return SSaccessories.sprite_accessories[MUTANT_SYNTH_SCREEN]

4
modular_skyrat/modules/customization/modules/surgery/organs/wings.dm
View File

@@ -20,9 +20,6 @@
/datum/bodypart_overlay/mutant/wings
color_source = ORGAN_COLOR_OVERRIDE
/datum/bodypart_overlay/mutant/wings/get_global_feature_list()
return SSaccessories.sprite_accessories["wings"]
//TODO: Well you know what this flight stuff is a bit complicated and hardcoded, this is enough for now
/datum/bodypart_overlay/mutant/wings/override_color(rgb_value)
@@ -68,7 +65,6 @@
/datum/bodypart_overlay/mutant/wings/functional/locked/get_global_feature_list()
if(wings_open)
return SSaccessories.sprite_accessories["wings_open"]
return SSaccessories.sprite_accessories["wings_functional"]

5
modular_skyrat/modules/customization/modules/surgery/organs/xenodorsal.dm
View File

@@ -13,12 +13,9 @@
bodypart_overlay = /datum/bodypart_overlay/mutant/xenodorsal
/datum/bodypart_overlay/mutant/xenodorsal
feature_key = "xenodorsal"
feature_key = FEATURE_XENODORSAL
layers = EXTERNAL_FRONT | EXTERNAL_BEHIND
color_source = ORGAN_COLOR_OVERRIDE
/datum/bodypart_overlay/mutant/xenodorsal/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/xenodorsal/get_global_feature_list()
return SSaccessories.sprite_accessories["xenodorsal"]

5
modular_skyrat/modules/customization/modules/surgery/organs/xenohead.dm
View File

@@ -14,12 +14,9 @@
bodypart_overlay = /datum/bodypart_overlay/mutant/xenohead
/datum/bodypart_overlay/mutant/xenohead
feature_key = "xenohead"
feature_key = FEATURE_XENOHEAD
layers = EXTERNAL_ADJACENT
color_source = ORGAN_COLOR_OVERRIDE
/datum/bodypart_overlay/mutant/xenohead/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/xenohead/get_global_feature_list()
return SSaccessories.sprite_accessories["xenohead"]

6
modular_zubbers/modules/taur_mechanics/taur_body.dm
View File

@@ -93,7 +93,7 @@
organ_flags = ORGAN_ROBOTIC
/datum/bodypart_overlay/mutant/taur_body
feature_key = "taur"
feature_key = FEATURE_TAUR
layers = ALL_EXTERNAL_OVERLAYS | EXTERNAL_FRONT_UNDER_CLOTHES | EXTERNAL_FRONT_OVER
color_source = ORGAN_COLOR_OVERRIDE
@@ -117,10 +117,6 @@
/datum/bodypart_overlay/mutant/taur_body/override_color(rgb_value)
return draw_color
/datum/bodypart_overlay/mutant/taur_body/get_global_feature_list()
return SSaccessories.sprite_accessories["taur"]
/obj/item/organ/taur_body/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
if(sprite_accessory_flags & SPRITE_ACCESSORY_HIDE_SHOES)
external_bodyshapes |= BODYSHAPE_HIDE_SHOES