diff --git a/code/__DEFINES/~~bubber_defines/traits/declarations.dm b/code/__DEFINES/~~bubber_defines/traits/declarations.dm index ec10ab14228..5e8440dd752 100644 --- a/code/__DEFINES/~~bubber_defines/traits/declarations.dm +++ b/code/__DEFINES/~~bubber_defines/traits/declarations.dm @@ -51,3 +51,6 @@ // For using tertiary mutant colors #define TRAIT_MUTANT_COLORS_3 "mutcolors3" + +/// Trait that says you're shaded by something (ie partially in the dark) +#define TRAIT_SHADED "shaded" diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 2ca43e8366b..3954840488c 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -531,6 +531,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE, "TRAIT_SELF_SURGERY" = TRAIT_SELF_SURGERY, "TRAIT_SETTLER" = TRAIT_SETTLER, + "TRAIT_SHADED" = TRAIT_SHADED, //BUBBER EDIT ADDITION "TRAIT_SHAVED" = TRAIT_SHAVED, "TRAIT_SHELL_RETREATED" = TRAIT_SHELL_RETREATED, "TRAIT_SHIFTY_EYES" = TRAIT_SHIFTY_EYES, diff --git a/code/datums/status_effects/debuffs/fire_stacks.dm b/code/datums/status_effects/debuffs/fire_stacks.dm index 40dbc901413..94143ced28b 100644 --- a/code/datums/status_effects/debuffs/fire_stacks.dm +++ b/code/datums/status_effects/debuffs/fire_stacks.dm @@ -379,6 +379,8 @@ BUBBER EDIT RESET THIS TG BACK TO MASTER ONCE YOU GET FISH INFUSION*/ var/datum/component/slippery/slipperiness /datum/status_effect/fire_handler/wet_stacks/on_apply() + if(HAS_TRAIT(owner, TRAIT_SHADED)) + return FALSE . = ..() RegisterSignals(owner, list(SIGNAL_ADDTRAIT(TRAIT_WET_FOR_LONGER), SIGNAL_REMOVETRAIT(TRAIT_WET_FOR_LONGER)), PROC_REF(update_wet_stack_modifier)) update_wet_stack_modifier() diff --git a/code/modules/research/designs/autolathe/service_designs.dm b/code/modules/research/designs/autolathe/service_designs.dm index 28207d660ad..2f60366a7e5 100644 --- a/code/modules/research/designs/autolathe/service_designs.dm +++ b/code/modules/research/designs/autolathe/service_designs.dm @@ -641,16 +641,3 @@ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE, ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE - -// BUBBER EDIT: Adds Umbrellas -/datum/design/umbrella - name = "Collapsable Umbrella" - id = "collapsable_umbrella" - build_type = PROTOLATHE | AUTOLATHE - materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.25) - build_path = /obj/item/umbrella/collapsible - category = list( - RND_CATEGORY_INITIAL, - RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE, - ) - departmental_flags = DEPARTMENT_BITFLAG_SERVICE diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm index e261c40c7f7..bb28a26a00c 100644 --- a/code/modules/research/techweb/nodes/service_nodes.dm +++ b/code/modules/research/techweb/nodes/service_nodes.dm @@ -37,7 +37,6 @@ "ticket_machine", "radio_entertainment", "photocopier", - "collapsable_umbrella", ) /datum/techweb_node/sanitation diff --git a/icons/map_icons/items/_item.dmi b/icons/map_icons/items/_item.dmi index 7af4030ca2e..229459aa5b1 100644 Binary files a/icons/map_icons/items/_item.dmi and b/icons/map_icons/items/_item.dmi differ diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm index 9dfd88fdcdb..61b1cc8bef5 100644 --- a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm +++ b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm @@ -90,6 +90,7 @@ design_ids += list( "gbp_machine", "plastic_hair_tie", + "umbrella", ) return ..() diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 69ebe439448..01a4d413f74 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -1578,6 +1578,22 @@ TREK icon_file = 'modular_skyrat/modules/hyposprays/icons/vials.dmi' json_config = 'modular_skyrat/modules/GAGS/json_configs/items/hypovial.json' +/datum/greyscale_config/umbrella + name = "Umbrella" + icon_file = 'modular_zubbers/icons/obj/equipment/umbrella.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/items/_umbrella.json' + +/datum/greyscale_config/umbrella_inhand_left + name = "Held Umbrella, Left, Closed" + icon_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json' + +/datum/greyscale_config/umbrella_inhand_right + name = "Held Umbrella, Right, Closed" + icon_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json' + + // Evil primitive catgirl clothing /datum/greyscale_config/primitive_catgirl_wraps diff --git a/modular_skyrat/modules/GAGS/json_configs/items/_umbrella.json b/modular_skyrat/modules/GAGS/json_configs/items/_umbrella.json new file mode 100644 index 00000000000..3e44cacc47f --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/items/_umbrella.json @@ -0,0 +1,28 @@ +{ + "umbrella_on": [ + { + "type": "icon_state", + "icon_state": "umbrella_on_handle", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "umbrella_on", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "umbrella": [ + { + "type": "icon_state", + "icon_state": "umbrella_handle", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "umbrella", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json b/modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json new file mode 100644 index 00000000000..e98d2d5156a --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json @@ -0,0 +1,31 @@ +{ + "umbrella_closed": [ + { + "type": "icon_state", + "icon_state": "umbrella_closed", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "umbrella_on": [ + { + "type": "icon_state", + "icon_state": "umbrella_handle", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "umbrella_on", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "umbrella_on_BACK": [ + { + "type": "icon_state", + "icon_state": "umbrella_on_BACK", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm index b8719eafef3..cec1eb7ac08 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm @@ -36,6 +36,9 @@ if(!owner || !owner.current || isbrain(owner.current)) return + if(HAS_TRAIT(owner.current, TRAIT_SHADED)) + return + if(!istype(owner.current.loc, /obj/structure)) if(COOLDOWN_FINISHED(src, bloodsucker_spam_sol_burn)) if(bloodsucker_level > 0) diff --git a/modular_zubbers/code/modules/loadout/categories/inhands.dm b/modular_zubbers/code/modules/loadout/categories/inhands.dm index 8fa605a95bc..6157434baeb 100644 --- a/modular_zubbers/code/modules/loadout/categories/inhands.dm +++ b/modular_zubbers/code/modules/loadout/categories/inhands.dm @@ -31,5 +31,9 @@ item_path = /obj/item/wheelchair /datum/loadout_item/inhand/sex_sign - name = "sex holosign projector" + name = "Sex Holosign Projector" item_path = /obj/item/holosign_creator/sex + +/datum/loadout_item/inhand/umbrella + name = "Umbrella" + item_path = /obj/item/umbrella diff --git a/modular_zubbers/code/modules/research/designs/misc_designs.dm b/modular_zubbers/code/modules/research/designs/misc_designs.dm index 41b691285e3..ca05247a3c5 100644 --- a/modular_zubbers/code/modules/research/designs/misc_designs.dm +++ b/modular_zubbers/code/modules/research/designs/misc_designs.dm @@ -78,3 +78,15 @@ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + +/datum/design/umbrella + name = "Umbrella" + id = "umbrella" + build_type = PROTOLATHE | AUTOLATHE + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.25) + build_path = /obj/item/umbrella + category = list( + RND_CATEGORY_INITIAL, + RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SERVICE, + ) + departmental_flags = DEPARTMENT_BITFLAG_SERVICE diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm b/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm index 6b364a48dee..cc225373240 100644 --- a/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm +++ b/modular_zubbers/code/modules/rimpoint_newfeatures/code/umbrella.dm @@ -1,146 +1,136 @@ +//Sprites by Constellado, MapleStation + /obj/item/umbrella name = "umbrella" icon = 'modular_zubbers/icons/obj/equipment/umbrella.dmi' icon_state = "umbrella" + post_init_icon_state = "umbrella" lefthand_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi' righthand_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi' - inhand_icon_state = "umbrella" + inhand_icon_state = "umbrella_closed" w_class = WEIGHT_CLASS_BULKY - custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.25) - custom_premium_price = PAYCHECK_COMMAND * 2 - - // Sound effect from the rain hitting it. - var/datum/looping_sound/umbrella/rain_on_plastic/looping_sound - - // Seems easier to do this. - var/mob/user_holding - - // For some overhang. - inhand_x_dimension = 64 - inhand_y_dimension = 64 - - // The umbrella provides some protection against weather effects. Perhaps you may want to change this. I don't judge. - var/immunity_type = TRAIT_RAINSTORM_IMMUNE - - -/obj/item/umbrella/equipped(mob/user, slot, initial = FALSE) - . = ..() - if(!looping_sound) - looping_sound = new(src, FALSE) - if(!user_holding) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) - user_holding = user - proccess_rainsounds() - -/obj/item/umbrella/dropped(mob/user, silent) - . = ..() - revoke_trait(user, immunity_type) - QDEL_NULL(looping_sound) - UnregisterSignal(user, COMSIG_MOVABLE_MOVED) - user_holding = null - -/obj/item/umbrella/proc/on_move(atom/old_loc, dir, forced, list/old_locs) - SIGNAL_HANDLER - - proccess_rainsounds(old_loc) - -/obj/item/umbrella/proc/proccess_rainsounds() - if(!SSweather) - return - - - var/turf/turf = get_turf(user_holding) - if(!turf) - return - var/datum/weather/weather = SSweather.get_weather(turf.z, get_area(turf)) - if(!weather || !(turf.loc in weather.impacted_areas) ) - looping_sound.stop() // If there is no weather, why even have a sound? - return - if(weather.recursive_weather_protection_check(user_holding)) // If the player is protected by the weather, play the umbrella sounds. - looping_sound.start() - else - looping_sound.stop() - -/obj/item/umbrella/collapsible - name = "collapsible umbrella" - icon = 'modular_zubbers/icons/obj/equipment/umbrella.dmi' - icon_state = "umbrella_retract_off" - slot_flags = ITEM_SLOT_POCKETS + force = 5 + throwforce = 5 w_class = WEIGHT_CLASS_SMALL - inhand_icon_state = "sheathed_umbrella" + custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5) + attack_verb_continuous = list("bludgeons", "whacks", "disciplines", "pummels") + attack_verb_simple = list("bludgeon", "whack", "discipline", "pummel") + hitsound = 'sound/items/weapons/genhit3.ogg' - /// Whether the umbrella is currently collapsed or open. - var/collapsed = FALSE - /// sound when toggled open/closed - var/toggle_sound = 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_open.ogg' - var/close_sound = 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_close.ogg' + //open umbrella offsets for the inhands + var/open_x_offset = 2 + var/open_y_offset = 2 -/obj/item/umbrella/collapsible/Initialize(mapload) + //Whether it's open or not + var/open = FALSE + + /// The sound effect played when our umbrella is opened + var/on_sound = 'sound/items/weapons/batonextend.ogg' + /// The inhand icon state used when our umbrella is opened. + var/on_inhand_icon_state = "umbrella_on" + + //greyscale stuff + greyscale_config = /datum/greyscale_config/umbrella + greyscale_config_inhand_left = /datum/greyscale_config/umbrella_inhand_left + greyscale_config_inhand_right = /datum/greyscale_config/umbrella_inhand_right + greyscale_colors = "#dddddd" + /// If the item should be assigned a random color + var/random_color = TRUE + /// List of possible random colors + var/static/list/umbrella_colors = list( + COLOR_BLUE, + COLOR_RED, + COLOR_PINK, + COLOR_BROWN, + COLOR_GREEN, + COLOR_CYAN, + COLOR_YELLOW, + COLOR_WHITE + ) + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/umbrella/Initialize(mapload) . = ..() + if(random_color) + set_greyscale(colors = list(pick(umbrella_colors))) AddComponent( \ /datum/component/transforming, \ + force_on = 7, \ + hitsound_on = "sound/weapons/genhit1.ogg", \ w_class_on = WEIGHT_CLASS_BULKY, \ - attack_verb_continuous_on = list("whaps", "thwacks", "whacks", "beats"), \ - attack_verb_simple_on = list("whap", "thwack", "whack", "beat"), \ + clumsy_check = FALSE, \ + attack_verb_continuous_on = list("swooshes", "whacks", "fwumps"), \ + attack_verb_simple_on = list("swoosh", "whack", "fwump"), \ ) RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) +/obj/item/umbrella/worn_overlays(mutable_appearance/standing, isinhands) + . = ..() + if(!isinhands) + return + var/mob/holder = loc + if(open) + if(ISODD(holder.get_held_index_of_item(src))) //left hand or right hand? + . += mutable_appearance(lefthand_file, inhand_icon_state + "_BACK", BELOW_MOB_LAYER) + else + . += mutable_appearance(righthand_file, inhand_icon_state + "_BACK", BELOW_MOB_LAYER) -/obj/item/umbrella/collapsible/proc/on_transform(obj/item/source, mob/user, active) + +/obj/item/umbrella/proc/on_transform(obj/item/source, mob/user, active) SIGNAL_HANDLER - - collapsed = active - if(!user) - return COMPONENT_BLOCK_TRANSFORM // Just in case. - if(collapsed) - icon_state = "umbrella_retract_on" - give_trait(user, immunity_type) - inhand_icon_state = "umbrella" - slot_flags = NONE - if(toggle_sound) - playsound(user, toggle_sound, 100) - to_chat(user, "You open the umbrella.") + inhand_icon_state = active ? on_inhand_icon_state : inhand_icon_state + open = active + if(user) + balloon_alert(user, active ? "opened" : "closed") + if(active) + ADD_TRAIT(user, TRAIT_SHADED, REF(src)) else - icon_state = "umbrella_retract_off" - inhand_icon_state = "sheathed_umbrella" - slot_flags = ITEM_SLOT_POCKETS - revoke_trait(user, immunity_type) - if(toggle_sound) - playsound(user, close_sound, 100) - to_chat(user, "You close the umbrella.") - - balloon_alert(user, active ? "extended" : "collapsed") - proccess_rainsounds() + REMOVE_TRAIT(user, TRAIT_SHADED, REF(src)) + playsound(src, on_sound, 50, TRUE) return COMPONENT_NO_DEFAULT_MESSAGE +/obj/item/umbrella/pickup(mob/user) + . = ..() + RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) + if(open) + ADD_TRAIT(user, TRAIT_SHADED, REF(src)) +/obj/item/umbrella/dropped(mob/user, silent) + . = ..() + REMOVE_TRAIT(user, TRAIT_SHADED, REF(src)) + UnregisterSignal(user, COMSIG_ATOM_DIR_CHANGE) -/obj/item/umbrella/proc/give_trait(mob/living/user,immunity_type) - ADD_TRAIT(user, immunity_type, REF(src)) +/obj/item/umbrella/proc/on_dir_change(mob/living/carbon/owner, olddir, newdir) + SIGNAL_HANDLER + owner.update_held_items() - -/obj/item/umbrella/proc/revoke_trait(mob/living/user,immunity_type) - REMOVE_TRAIT(user, immunity_type, REF(src)) +/obj/item/umbrella/get_worn_offsets(isinhands) + . = ..() + var/mob/holder = loc + if(open) + .[2] += open_y_offset + switch(loc.dir) + if(NORTH) + .[1] += ISODD(holder.get_held_index_of_item(src)) ? -open_x_offset : open_x_offset + if(SOUTH) + .[1] += ISODD(holder.get_held_index_of_item(src)) ? open_x_offset : -open_x_offset + if(EAST) + .[1] -= open_x_offset + if(WEST) + .[1] += open_x_offset -/datum/looping_sound/umbrella/rain_on_plastic - mid_sounds = list( - 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic2.ogg' = 1, - 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic3.ogg' = 1, - 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic4.ogg' = 1, - 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic5.ogg' = 1, - 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic6.ogg' = 1, - 'modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic7.ogg' = 1, - ) - mid_length = 2.5 SECONDS - falloff_distance = 1 - falloff_exponent = 10 - volume = 25 - use_reverb = TRUE - in_order = TRUE +//other umbrellas +/obj/item/umbrella/parasol + name = "parasol" + desc = "A black laced parsol, how intricate." + icon_state = "parasol" + inhand_icon_state = "parasol_closed" + on_inhand_icon_state = "parasol_on" + random_color = FALSE + greyscale_config = null + greyscale_config_inhand_left = null + greyscale_config_inhand_right = null -/datum/loadout_item/inhand/collapsible_umbrella - name = "Umbrella" - item_path = /obj/item/umbrella/collapsible diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/attributions.txt b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/attributions.txt deleted file mode 100644 index dc8c6e1ea28..00000000000 --- a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/attributions.txt +++ /dev/null @@ -1 +0,0 @@ -raindrops.umbrella.flac by dobroide -- https://freesound.org/s/14901/ -- License: Attribution 4.0 diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic2.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic2.ogg deleted file mode 100644 index d93dfdef5b4..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic2.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic3.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic3.ogg deleted file mode 100644 index a18d42aadd1..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic3.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic4.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic4.ogg deleted file mode 100644 index 6dc794a96da..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic4.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic5.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic5.ogg deleted file mode 100644 index 44fb6643010..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic5.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic6.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic6.ogg deleted file mode 100644 index c54582bb9b4..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic6.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic7.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic7.ogg deleted file mode 100644 index def1c8569b9..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic7.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_close.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_close.ogg deleted file mode 100644 index e3ca23fbbbb..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_close.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_open.ogg b/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_open.ogg deleted file mode 100644 index 0de44fc42a9..00000000000 Binary files a/modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_open.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/vending/clothesmate.dm b/modular_zubbers/code/modules/vending/clothesmate.dm index d9aae60f8d0..7adea70cc3c 100644 --- a/modular_zubbers/code/modules/vending/clothesmate.dm +++ b/modular_zubbers/code/modules/vending/clothesmate.dm @@ -225,6 +225,7 @@ /obj/item/clothing/under/costume/skyrat/bathrobe = 5, /obj/item/riding_saddle/leather = 5, /obj/item/storage/backpack/saddlebags = 5, + /obj/item/umbrella = 20, ) ) ) diff --git a/modular_zubbers/icons/obj/equipment/umbrella.dmi b/modular_zubbers/icons/obj/equipment/umbrella.dmi index c4ae465bc4f..649ecf3475a 100644 Binary files a/modular_zubbers/icons/obj/equipment/umbrella.dmi and b/modular_zubbers/icons/obj/equipment/umbrella.dmi differ diff --git a/modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi b/modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi index 3f042556ee1..358a96f2a4d 100644 Binary files a/modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi and b/modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi differ diff --git a/modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi b/modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi index e41efd5c8a0..3bf6d9bf8ba 100644 Binary files a/modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi and b/modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi differ