From 5055fbe77d673ed18b6edb289c60962cd88989de Mon Sep 17 00:00:00 2001
From: Cursor <102828457+theselfish@users.noreply.github.com>
Date: Fri, 17 Oct 2025 00:06:41 +0100
Subject: [PATCH] Ports colourable Umbrellas from Monkey, makes the rain hiding
a trait (#4803)
## About The Pull Request
Title.
## Why It's Good For The Game
It's colourable, trait can be used for more. Shaded vamp funny.
- [x] Port basic stuff.
- [x] Weather stuff.
- [x] Vampire stuff.
## Proof Of Testing
Screenshots/Videos
## Changelog
:cl: Absolucy, Constellado, theselfish, Arturlang
add: Umbrellas are now gags colourable!
add: Umbrellas protect vampires from the sun.
/:cl:
---
.../~~bubber_defines/traits/declarations.dm | 3 +
code/_globalvars/traits/_traits.dm | 1 +
.../status_effects/debuffs/fire_stacks.dm | 2 +
.../designs/autolathe/service_designs.dm | 13 -
.../research/techweb/nodes/service_nodes.dm | 1 -
icons/map_icons/items/_item.dmi | Bin 27184 -> 27575 bytes
.../modules/research/techweb/all_nodes.dm | 1 +
.../modules/GAGS/greyscale_configs.dm | 16 ++
.../GAGS/json_configs/items/_umbrella.json | 28 +++
.../json_configs/items/_umbrella_inhand.json | 31 +++
.../bloodsucker/bloodsuckers/sol.dm | 3 +
.../modules/loadout/categories/inhands.dm | 6 +-
.../modules/research/designs/misc_designs.dm | 12 +
.../rimpoint_newfeatures/code/umbrella.dm | 222 +++++++++---------
.../sound/attributions.txt | 1 -
.../sound/effects/rain_on_plastic2.ogg | Bin 881652 -> 0 bytes
.../sound/effects/rain_on_plastic3.ogg | Bin 880684 -> 0 bytes
.../sound/effects/rain_on_plastic4.ogg | Bin 882044 -> 0 bytes
.../sound/effects/rain_on_plastic5.ogg | Bin 882044 -> 0 bytes
.../sound/effects/rain_on_plastic6.ogg | Bin 882036 -> 0 bytes
.../sound/effects/rain_on_plastic7.ogg | Bin 882036 -> 0 bytes
.../sound/effects/umbrella_close.ogg | Bin 342828 -> 0 bytes
.../sound/effects/umbrella_open.ogg | Bin 244300 -> 0 bytes
.../code/modules/vending/clothesmate.dm | 1 +
.../icons/obj/equipment/umbrella.dmi | Bin 705 -> 2149 bytes
.../icons/obj/equipment/umbrella_inhand_l.dmi | Bin 1352 -> 5482 bytes
.../icons/obj/equipment/umbrella_inhand_r.dmi | Bin 1336 -> 5639 bytes
27 files changed, 209 insertions(+), 132 deletions(-)
create mode 100644 modular_skyrat/modules/GAGS/json_configs/items/_umbrella.json
create mode 100644 modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/attributions.txt
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic2.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic3.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic4.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic5.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic6.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/rain_on_plastic7.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_close.ogg
delete mode 100644 modular_zubbers/code/modules/rimpoint_newfeatures/sound/effects/umbrella_open.ogg
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 7af4030ca2e9b1de6fca7c1eaba44d49b6e3b3da..229459aa5b10976184078b5eeb57739caf1a651f 100644
GIT binary patch
delta 6955
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
delta 6561
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
NqO7V+rIdN-{{T@Qhq(X%
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 d93dfdef5b4b2ff0c31e1cb841161598daa29aec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 881652
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