From 5673fefeb385d791d155d7a7b05b87e59958aa9c Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Fri, 22 Sep 2023 03:14:04 -0400 Subject: [PATCH] Makes flashlights not need cells to operate anymore, by consequences removes that one feature where you can change flashlight light power that nobody uses ever. (#23741) * why was that sound change there btw? * deletes unused flashlight sfx --- code/game/objects/items/devices/flashlight.dm | 2 +- .../master_files/sound/effects/flashlight.ogg | Bin 21279 -> 0 bytes .../modules/cell_component/code/flashlight.dm | 138 ------------------ tgstation.dme | 1 - 4 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 modular_skyrat/master_files/sound/effects/flashlight.ogg delete mode 100644 modular_skyrat/modules/cell_component/code/flashlight.dm diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 735510ae9d4..ecf94d58f70 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -72,7 +72,7 @@ /obj/item/flashlight/proc/toggle_light(mob/user) var/disrupted = FALSE on = !on - //playsound(src, on ? sound_on : sound_off, 40, TRUE) SKYRAT EDIT REMOVAL - SOUND HANDLED IN MODULAR FLASHLIGHT.DM + playsound(src, on ? sound_on : sound_off, 40, TRUE) if(!COOLDOWN_FINISHED(src, disabled_time)) if(user) balloon_alert(user, "disrupted!") diff --git a/modular_skyrat/master_files/sound/effects/flashlight.ogg b/modular_skyrat/master_files/sound/effects/flashlight.ogg deleted file mode 100644 index 627675997cf394ed68b3ebea951f9420c4d1a250..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21279 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ⅈ+i051ZCT1M7aT1hC6JAmslH6 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 diff --git a/modular_skyrat/modules/cell_component/code/flashlight.dm b/modular_skyrat/modules/cell_component/code/flashlight.dm deleted file mode 100644 index 6e585781a83..00000000000 --- a/modular_skyrat/modules/cell_component/code/flashlight.dm +++ /dev/null @@ -1,138 +0,0 @@ -#define FLASHLIGHT_MODE_LOW "low" -#define FLASHLIGHT_MODE_MEDIUM "medium" -#define FLASHLIGHT_MODE_HIGH "high" - -/obj/item/flashlight - /// Does this flashlight utilize batteries? - var/uses_battery = TRUE - /// What's this flashlight's special cell, if any? - var/cell_override - /// How much power (per process) does this flashlight use, if uses_battery = TRUE - power_use_amount = POWER_CELL_USE_MINIMUM - /// Mode of the flashlight, how strong the light is and how much the power usage is affected. - var/flashlight_mode = FLASHLIGHT_MODE_LOW - /// Does this flashlight have modes? - var/has_modes = TRUE - /// Does this flashlight make the extra noise upon being turned on? - var/makes_noise_when_lit = TRUE - -/obj/item/flashlight/Initialize(mapload) - . = ..() - update_item_action_buttons() - - if(uses_battery) - AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(quietly_turn_off)), _has_cell_overlays = FALSE) - -/obj/item/flashlight/examine(mob/user) - . = ..() - if(has_modes) - . += "This flashlight has modes! Ctrl-click it to change the mode." - . += "It is currently set to [flashlight_mode] intensity." - -/obj/item/flashlight/CtrlClick(mob/user) - . = ..() - if(has_modes) - switch(flashlight_mode) - if(FLASHLIGHT_MODE_LOW) - flashlight_mode = FLASHLIGHT_MODE_MEDIUM - power_use_amount = POWER_CELL_USE_VERY_LOW - set_light_range(initial(light_range) + 1) - set_light_power(initial(light_power) + 1) - to_chat(user, span_notice("You set [src] to medium.")) - if(FLASHLIGHT_MODE_MEDIUM) - flashlight_mode = FLASHLIGHT_MODE_HIGH - power_use_amount = POWER_CELL_USE_LOW - set_light_range(initial(light_range) + 2) - set_light_power(initial(light_power) + 2) - to_chat(user, span_notice("You set [src] to high.")) - if(FLASHLIGHT_MODE_HIGH) - flashlight_mode = FLASHLIGHT_MODE_LOW - power_use_amount = POWER_CELL_USE_MINIMUM - set_light_range(initial(light_range)) - set_light_power(initial(light_power)) - to_chat(user, span_notice("You set [src] to low.")) - -/obj/item/flashlight/toggle_light(noisy = TRUE) - . = ..() - if(on) - after_turn_on() - if(uses_battery && !(item_use_power(power_use_amount, TRUE) & COMPONENT_POWER_SUCCESS)) - return - if(noisy) - playsound(src, on ? sound_on : sound_off, 40, TRUE) - -/** - * Handles turning on the flashlight. - * Parameters: - * * noisy - Boolean on whether the flashlight should make an additional noise from being turned on or not. Defaults to TRUE. - */ -/obj/item/flashlight/proc/after_turn_on(noisy = TRUE) - if(uses_battery) - START_PROCESSING(SSobj, src) - if(noisy) - playsound(src, 'modular_skyrat/master_files/sound/effects/flashlight.ogg', 40, TRUE) //Credits to ERIS for the sound - -/// Quietly turns the flashlight off if it was on (called by the battery running out of charge). -/obj/item/flashlight/proc/quietly_turn_off() - if(on) - toggle_light(noisy = FALSE) - -/obj/item/flashlight/process(seconds_per_tick) - if(!on) - STOP_PROCESSING(SSobj, src) - return - if(uses_battery && !(item_use_power(power_use_amount) & COMPONENT_POWER_SUCCESS)) - quietly_turn_off() - -/obj/item/flashlight/update_icon_state() - . = ..() - if(on) - icon_state = "[initial(icon_state)]-on" - else - icon_state = initial(icon_state) - -/obj/item/flashlight/seclite - cell_override = /obj/item/stock_parts/cell/upgraded - -/obj/item/flashlight/lamp - uses_battery = FALSE - has_modes = FALSE - -/obj/item/flashlight/lantern - uses_battery = FALSE - has_modes = FALSE - makes_noise_when_lit = FALSE - -/obj/item/flashlight/slime - uses_battery = FALSE - has_modes = FALSE - makes_noise_when_lit = FALSE - -/obj/item/flashlight/flare - uses_battery = FALSE - has_modes = FALSE - makes_noise_when_lit = FALSE - -/obj/item/flashlight/emp/debug - uses_battery = FALSE - -/obj/item/flashlight/glowstick - uses_battery = FALSE - has_modes = FALSE - makes_noise_when_lit = FALSE - -/obj/item/flashlight/spotlight - uses_battery = FALSE - has_modes = FALSE - -/obj/item/flashlight/eyelight - uses_battery = FALSE - has_modes = FALSE - -/obj/item/flashlight/pen - cell_override = /obj/item/stock_parts/cell/potato - has_modes = FALSE - -#undef FLASHLIGHT_MODE_LOW -#undef FLASHLIGHT_MODE_MEDIUM -#undef FLASHLIGHT_MODE_HIGH diff --git a/tgstation.dme b/tgstation.dme index abbd8e41597..e83beb8ee84 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6365,7 +6365,6 @@ #include "modular_skyrat\modules\cargoborg\code\robot_items.dm" #include "modular_skyrat\modules\cargoborg\code\robot_modules.dm" #include "modular_skyrat\modules\cell_component\code\cell_component.dm" -#include "modular_skyrat\modules\cell_component\code\flashlight.dm" #include "modular_skyrat\modules\cellguns\code\cellgun_cells.dm" #include "modular_skyrat\modules\cellguns\code\cellguns.dm" #include "modular_skyrat\modules\cellguns\code\medigun_cells.dm"