mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-06-22 06:35:12 +01:00
f58b8511f0
## About The Pull Request This PR refactors ``effect_system``s to be a bit easier to use by getting rid of ``set_up``, allowing ``attach()`` to be chained into ``start()`` and refactoring most direct system usages in our code to use helper procs. ``set_up`` was unnecessary and only existed to allow ``New``'s behavior to be fully overriden, which is not required if we split sparks/lightning/steam into a new ``/datum/effect_system/basic`` subtype which houses the effect spreading behavior. This allows us to roll all logic from ``set_up`` into ``New`` and cut down on code complexity. Chaining setup as ``system.attach(src).start()`` also helps a bit in case no helper method exists I've added ``do_chem_smoke`` and ``do_foam`` helpers, which respectively allow chemical smoke or foam to be spawned easily without having to manually create effect datums and reagent holders. Also turns out we've had some nonfunctional effect systems which either never set themselves up, or never started, so I fixed those while I was at it (mostly by moving them to aforementioned helper procs) ## Why It's Good For The Game Cleaner code, makes it significantly easier for users to work with. Also most of our effect system usage was copypasta which was passing booleans as numbers, while perfectly fine helper procs existed in our code. ## Changelog 🆑 refactor: Refactored sparks, foam, smoke, and other miscellaneous effect systems. refactor: Vapes now have consistent rigging with cigs using the new system. fix: Fixed some effects never working. /🆑
339 lines
13 KiB
Plaintext
339 lines
13 KiB
Plaintext
/** This structure acts as a source of moisture loving cell lines,
|
|
as well as a location where a hidden item can sometimes be retrieved
|
|
at the cost of risking a vicious bite.**/
|
|
/obj/structure/moisture_trap
|
|
name = "moisture trap"
|
|
desc = "A device installed in order to control moisture in poorly ventilated areas.\nThe stagnant water inside basin seems to produce serious biofouling issues when improperly maintained.\nThis unit in particular seems to be teeming with life!\nWho thought mother Gaia could assert herself so vigorously in this sterile and desolate place?"
|
|
icon_state = "moisture_trap"
|
|
anchored = TRUE
|
|
density = FALSE
|
|
///This var stores the hidden item that might be able to be retrieved from the trap
|
|
var/obj/item/hidden_item
|
|
///This var determines if there is a chance to receive a bite when sticking your hand into the water.
|
|
var/critter_infested = TRUE
|
|
///A subtle loop which plays a drop of water sound every once in a while
|
|
var/datum/looping_sound/drip/drip_sfx
|
|
///weighted loot table for what loot you can find inside the moisture trap.
|
|
///the actual loot isn't that great and should probably be improved and expanded later.
|
|
var/static/list/loot_table = list(
|
|
/obj/item/food/meat/slab/human/mutant/skeleton = 35,
|
|
/obj/item/food/meat/slab/human/mutant/zombie = 15,
|
|
/obj/item/trash/can = 15,
|
|
/obj/item/clothing/head/helmet/skull = 10,
|
|
/obj/item/restraints/handcuffs = 4,
|
|
/obj/item/restraints/handcuffs/cable/red = 1,
|
|
/obj/item/restraints/handcuffs/cable/blue = 1,
|
|
/obj/item/restraints/handcuffs/cable/green = 1,
|
|
/obj/item/restraints/handcuffs/cable/pink = 1,
|
|
/obj/item/restraints/handcuffs/alien = 2,
|
|
/obj/item/coin/bananium = 10,
|
|
/obj/item/knife/butcher = 5,
|
|
)
|
|
|
|
|
|
/obj/structure/moisture_trap/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/fish_safe_storage)
|
|
AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOIST, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 20)
|
|
if(prob(40))
|
|
critter_infested = FALSE
|
|
if(prob(75))
|
|
var/picked_item = pick_weight(loot_table)
|
|
hidden_item = new picked_item(src)
|
|
|
|
var/datum/fish_source/moisture_trap/fish_source = new
|
|
if(prob(50)) // 50% chance there's another item to fish out of there
|
|
var/picked_item = pick_weight(loot_table)
|
|
fish_source.fish_table[picked_item] = 5
|
|
fish_source.fish_counts[picked_item] = 1;
|
|
AddComponent(/datum/component/fishing_spot, fish_source)
|
|
drip_sfx = new(src)
|
|
drip_sfx.start()
|
|
|
|
|
|
/obj/structure/moisture_trap/Destroy()
|
|
if(hidden_item)
|
|
QDEL_NULL(hidden_item)
|
|
drip_sfx?.stop(TRUE)
|
|
return ..()
|
|
|
|
|
|
///This proc checks if we are able to reach inside the trap to interact with it.
|
|
/obj/structure/moisture_trap/proc/CanReachInside(mob/user)
|
|
if(!isliving(user))
|
|
return FALSE
|
|
var/mob/living/living_user = user
|
|
if(living_user.body_position == STANDING_UP && ishuman(living_user)) //I don't think monkeys can crawl on command.
|
|
return FALSE
|
|
return TRUE
|
|
|
|
|
|
/obj/structure/moisture_trap/attack_hand(mob/user, list/modifiers)
|
|
. = ..()
|
|
if(iscyborg(user) || isalien(user))
|
|
return
|
|
if(!CanReachInside(user))
|
|
to_chat(user, span_warning("You need to lie down to reach into [src]."))
|
|
return
|
|
to_chat(user, span_notice("You reach down into the cold water of the basin."))
|
|
playsound(src,'sound/effects/submerge.ogg', 25, TRUE)
|
|
if(!do_after(user, 2 SECONDS, target = src))
|
|
return
|
|
if(hidden_item)
|
|
user.put_in_hands(hidden_item)
|
|
to_chat(user, span_notice("As you poke around inside [src] you feel the contours of something hidden below the murky waters.</span>\n<span class='nicegreen'>You retrieve [hidden_item] from [src]."))
|
|
hidden_item = null
|
|
return
|
|
if(critter_infested && prob(50) && iscarbon(user))
|
|
var/mob/living/carbon/bite_victim = user
|
|
var/obj/item/bodypart/affecting = bite_victim.get_active_hand()
|
|
to_chat(user, span_danger("You feel a sharp pain as an unseen creature sinks its [pick("fangs", "beak", "proboscis")] into your [affecting.plaintext_zone]!"))
|
|
bite_victim.apply_damage(30, BRUTE, affecting)
|
|
playsound(src,'sound/items/weapons/bite.ogg', 70, TRUE)
|
|
return
|
|
to_chat(user, span_warning("You find nothing of value..."))
|
|
|
|
/obj/structure/moisture_trap/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
|
|
if(iscyborg(user) || isalien(user) || !CanReachInside(user))
|
|
return ..()
|
|
add_fingerprint(user)
|
|
if(is_reagent_container(I))
|
|
if(istype(I, /obj/item/food/monkeycube))
|
|
var/obj/item/food/monkeycube/cube = I
|
|
cube.Expand()
|
|
return
|
|
var/obj/item/reagent_containers/reagent_container = I
|
|
if(reagent_container.is_open_container())
|
|
reagent_container.reagents.add_reagent(/datum/reagent/water, min(reagent_container.volume - reagent_container.reagents.total_volume, reagent_container.amount_per_transfer_from_this))
|
|
to_chat(user, span_notice("You fill [reagent_container] from [src]."))
|
|
return
|
|
if(hidden_item)
|
|
to_chat(user, span_warning("There is already something inside [src]."))
|
|
return
|
|
if(!user.transferItemToLoc(I, src))
|
|
to_chat(user, span_warning("\The [I] is stuck to your hand, you cannot put it in [src]!"))
|
|
return
|
|
hidden_item = I
|
|
to_chat(user, span_notice("You hide [I] inside the basin."))
|
|
playsound(src,'sound/effects/splash.ogg', 55, TRUE)
|
|
|
|
#define ALTAR_INACTIVE 0
|
|
#define ALTAR_STAGEONE 1
|
|
#define ALTAR_STAGETWO 2
|
|
#define ALTAR_STAGETHREE 3
|
|
#define ALTAR_TIME (9.5 SECONDS)
|
|
|
|
/obj/structure/destructible/cult/pants_altar
|
|
name = "strange structure"
|
|
desc = "What is this? Who put it on this station? And why does it emanate <span class='hypnophrase'>strange energy?</span>"
|
|
icon_state = "altar"
|
|
cult_examine_tip = "Even you don't understand the eldritch magic behind this."
|
|
break_message = span_warning("The structure shatters, leaving only a demonic screech!")
|
|
break_sound = 'sound/effects/magic/demon_dies.ogg'
|
|
light_color = LIGHT_COLOR_BLOOD_MAGIC
|
|
light_range = 2
|
|
use_cooldown_duration = 1 MINUTES
|
|
/// Color of the pants that will come out
|
|
var/pants_color = COLOR_WHITE
|
|
/// Stage of the pants making process
|
|
var/status = ALTAR_INACTIVE
|
|
|
|
/obj/structure/destructible/cult/pants_altar/attackby(obj/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
|
|
if(istype(attacking_item, /obj/item/melee/cultblade/dagger) && IS_CULTIST(user) && status)
|
|
to_chat(user, span_notice("[src] is creating something, you can't move it!"))
|
|
return
|
|
return ..()
|
|
|
|
/obj/structure/destructible/cult/pants_altar/attack_hand(mob/living/user, list/modifiers)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
var/list/altar_options = list(
|
|
"Change Color" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_recolor"),
|
|
"Create Artefact" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_create")
|
|
)
|
|
var/altar_result = show_radial_menu(user, src, altar_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
|
|
switch(altar_result)
|
|
if("Change Color")
|
|
var/chosen_color = tgui_color_picker(user, "", "Choose Color", pants_color)
|
|
if(!isnull(chosen_color) && user.can_perform_action(src))
|
|
pants_color = chosen_color
|
|
if("Create Artefact")
|
|
if(!COOLDOWN_FINISHED(src, use_cooldown) || status != ALTAR_INACTIVE)
|
|
to_chat(user, span_warning("[src] is not ready to create something new yet..."))
|
|
return
|
|
pants_stageone()
|
|
return TRUE
|
|
|
|
/obj/structure/destructible/cult/pants_altar/update_icon_state()
|
|
. = ..()
|
|
if(!COOLDOWN_FINISHED(src, use_cooldown))
|
|
icon_state = "altar_off"
|
|
else
|
|
icon_state = "altar"
|
|
|
|
/obj/structure/destructible/cult/pants_altar/update_overlays()
|
|
. = ..()
|
|
var/overlayicon
|
|
switch(status)
|
|
if(ALTAR_INACTIVE)
|
|
return
|
|
if(ALTAR_STAGEONE)
|
|
overlayicon = "altar_pants1"
|
|
if(ALTAR_STAGETWO)
|
|
overlayicon = "altar_pants2"
|
|
if(ALTAR_STAGETHREE)
|
|
overlayicon = "altar_pants3"
|
|
var/mutable_appearance/pants_overlay = mutable_appearance(icon, overlayicon, appearance_flags = RESET_COLOR|KEEP_APART)
|
|
pants_overlay.color = pants_color
|
|
. += pants_overlay
|
|
|
|
/// Starts creating the pants, plays the sound.
|
|
/obj/structure/destructible/cult/pants_altar/proc/pants_stageone()
|
|
status = ALTAR_STAGEONE
|
|
update_icon()
|
|
visible_message(span_warning("[src] starts creating something..."))
|
|
playsound(src, 'sound/effects/magic/pantsaltar.ogg', 60)
|
|
addtimer(CALLBACK(src, PROC_REF(pants_stagetwo)), ALTAR_TIME)
|
|
|
|
/// Continues the creation, making every mob nearby nauseous.
|
|
/obj/structure/destructible/cult/pants_altar/proc/pants_stagetwo()
|
|
status = ALTAR_STAGETWO
|
|
update_icon()
|
|
visible_message(span_warning("You start feeling nauseous..."))
|
|
for(var/mob/living/viewing_mob in viewers(7, src))
|
|
viewing_mob.set_eye_blur_if_lower(20 SECONDS)
|
|
viewing_mob.adjust_confusion(10 SECONDS)
|
|
addtimer(CALLBACK(src, PROC_REF(pants_stagethree)), ALTAR_TIME)
|
|
|
|
/// Continues the creation, making every mob nearby dizzy
|
|
/obj/structure/destructible/cult/pants_altar/proc/pants_stagethree()
|
|
status = ALTAR_STAGETHREE
|
|
update_icon()
|
|
visible_message(span_warning("You start feeling horrible..."))
|
|
for(var/mob/living/viewing_mob in viewers(7, src))
|
|
viewing_mob.set_dizzy_if_lower(20 SECONDS)
|
|
addtimer(CALLBACK(src, PROC_REF(pants_create)), ALTAR_TIME)
|
|
|
|
/// Finishes the creation, creating the item itself, setting the cooldowns and flashing every mob nearby.
|
|
/obj/structure/destructible/cult/pants_altar/proc/pants_create()
|
|
status = ALTAR_INACTIVE
|
|
update_icon()
|
|
visible_message(span_danger("[src] emits a flash of light and creates... pants?"))
|
|
for(var/mob/living/viewing_mob in viewers(7, src))
|
|
viewing_mob.flash_act()
|
|
var/obj/item/clothing/under/pants/slacks/altar/pants = new(get_turf(src))
|
|
pants.add_atom_colour(pants_color, ADMIN_COLOUR_PRIORITY)
|
|
COOLDOWN_START(src, use_cooldown, use_cooldown_duration)
|
|
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 MINUTES + 0.1 SECONDS)
|
|
update_icon()
|
|
|
|
/obj/structure/destructible/cult/pants_altar/proc/check_menu(mob/user)
|
|
if(!istype(user))
|
|
return FALSE
|
|
if(user.incapacitated || !user.Adjacent(src))
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/obj/item/clothing/under/pants/slacks/altar
|
|
name = "strange pants"
|
|
desc = "A pair of pants. They do not look or feel natural, and smell like fresh blood."
|
|
icon_state = "/obj/item/clothing/under/pants/slacks/altar"
|
|
greyscale_colors = "#ffffff#ffffff#ffffff"
|
|
flags_1 = NONE //If IS_PLAYER_COLORABLE gets added color-changing support (i.e. spraycans), these won't end up getting it too. Plus, it already has its own recolor.
|
|
|
|
#undef ALTAR_INACTIVE
|
|
#undef ALTAR_STAGEONE
|
|
#undef ALTAR_STAGETWO
|
|
#undef ALTAR_STAGETHREE
|
|
#undef ALTAR_TIME
|
|
|
|
/**
|
|
* Spawns in maint shafts, and blocks lines of sight perodically when active.
|
|
*/
|
|
/obj/structure/steam_vent
|
|
name = "steam vent"
|
|
desc = "A device periodically filtering out moisture particles from the nearby walls and windows. It's only possible due to the moisture traps nearby."
|
|
icon_state = "steam_vent"
|
|
anchored = TRUE
|
|
density = FALSE
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.3, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 2)
|
|
/// How often does the vent reset the blow_steam cooldown.
|
|
var/steam_speed = 20 SECONDS
|
|
/// Is the steam vent active?
|
|
var/vent_active = TRUE
|
|
/// The cooldown for toggling the steam vent to prevent infinite steam vent looping.
|
|
COOLDOWN_DECLARE(steam_vent_interact)
|
|
|
|
/obj/structure/steam_vent/Initialize(mapload)
|
|
. = ..()
|
|
if(prob(75))
|
|
vent_active = FALSE
|
|
var/static/list/loc_connections = list(
|
|
COMSIG_ATOM_EXIT = PROC_REF(blow_steam),
|
|
)
|
|
AddElement(/datum/element/connect_loc, loc_connections)
|
|
register_context()
|
|
update_icon_state()
|
|
|
|
/obj/structure/steam_vent/attack_hand(mob/living/user, list/modifiers)
|
|
. = ..()
|
|
if(!COOLDOWN_FINISHED(src, steam_vent_interact))
|
|
balloon_alert(user, "not ready to adjust!")
|
|
return
|
|
vent_active = !vent_active
|
|
update_icon_state()
|
|
if(vent_active)
|
|
balloon_alert(user, "vent on")
|
|
else
|
|
balloon_alert(user, "vent off")
|
|
return
|
|
blow_steam()
|
|
|
|
/obj/structure/steam_vent/add_context(atom/source, list/context, obj/item/held_item, mob/user)
|
|
. = ..()
|
|
if(isnull(held_item))
|
|
context[SCREENTIP_CONTEXT_LMB] = vent_active ? "Close valve" : "Open valve"
|
|
return CONTEXTUAL_SCREENTIP_SET
|
|
if(held_item.tool_behaviour == TOOL_WRENCH)
|
|
context[SCREENTIP_CONTEXT_RMB] = "Deconstruct"
|
|
return CONTEXTUAL_SCREENTIP_SET
|
|
return .
|
|
|
|
/obj/structure/steam_vent/wrench_act_secondary(mob/living/user, obj/item/tool)
|
|
. = ..()
|
|
if(vent_active)
|
|
balloon_alert(user, "must be off!")
|
|
return
|
|
if(tool.use_tool(src, user, 3 SECONDS))
|
|
playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
|
|
deconstruct()
|
|
return TRUE
|
|
|
|
/obj/structure/steam_vent/atom_deconstruct(disassembled = TRUE)
|
|
new /obj/item/stack/sheet/iron(loc)
|
|
new /obj/item/stock_parts/water_recycler(loc, 1)
|
|
|
|
/**
|
|
* Creates "steam" smoke, and determines when the vent needs to block line of sight via reset_opacity.
|
|
*/
|
|
/obj/structure/steam_vent/proc/blow_steam(datum/source, atom/movable/leaving, direction)
|
|
SIGNAL_HANDLER
|
|
if(!vent_active)
|
|
return
|
|
if(!COOLDOWN_FINISHED(src, steam_vent_interact))
|
|
return
|
|
if(!ismob(leaving))
|
|
return
|
|
do_smoke(1, src, loc)
|
|
playsound(src, 'sound/machines/steam_hiss.ogg', 75, TRUE, -2)
|
|
COOLDOWN_START(src, steam_vent_interact, steam_speed)
|
|
|
|
/obj/structure/steam_vent/update_icon_state()
|
|
. = ..()
|
|
icon_state = "steam_vent[vent_active ? "": "_off"]"
|
|
|
|
/obj/structure/steam_vent/fast
|
|
desc = "A device periodically filtering out moisture particles from the nearby walls and windows. It's only possible due to the moisture traps nearby. It's faster than most."
|
|
steam_speed = 10 SECONDS
|