cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc File Purge: The Return (#92438)

Browse Source 
## About The Pull Request

Purged several files inthe theme of misc.dm and broken the contents out
into better organised files.

Incidentally done some minor cleanup by removing an unused global list
referring to a string file that no-longer exists, and removing a useless
proc that replicated the behaviour of file2list().

## Why It's Good For The Game

See #60358 and all its successors

## Changelog
🆑
code: Reduced the number of files named misc.dm or similar by 14%.
/🆑
# Conflicts:
#	code/_globalvars/lists/flavor_misc.dm
This commit is contained in:
Thunder12345
2025-08-19 22:35:47 -04:00
committed by nevimer
parent 2ecc123578
commit 6618c9d694
31 changed files with 709 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/cups/mauna_mug.dm
+117
View File
@@ -0,0 +1,117 @@
/obj/item/reagent_containers/cup/maunamug
name = "mauna mug"
desc = "A drink served in a classy mug. Now with built-in heating!"
icon = 'icons/obj/devices/mauna_mug.dmi'
icon_state = "maunamug"
base_icon_state = "maunamug"
spillable = TRUE
reagent_flags = OPENCONTAINER
fill_icon_state = "maunafilling"
fill_icon_thresholds = list(25)
var/obj/item/stock_parts/power_store/cell
var/open = FALSE
var/on = FALSE
/obj/item/reagent_containers/cup/maunamug/Initialize(mapload, vol)
. = ..()
cell = new /obj/item/stock_parts/power_store/cell(src)
/obj/item/reagent_containers/cup/maunamug/get_cell()
return cell
/obj/item/reagent_containers/cup/maunamug/examine(mob/user)
. = ..()
. += span_notice("The status display reads: Current temperature: <b>[reagents.chem_temp]K</b> Current Charge:[cell ? "[cell.charge / cell.maxcharge * 100]%" : "No cell found"].")
if(open)
. += span_notice("The battery case is open.")
if(cell && cell.charge > 0)
. += span_notice("<b>Ctrl+Click</b> to toggle the power.")
/obj/item/reagent_containers/cup/maunamug/process(seconds_per_tick)
..()
if(on && (!cell || cell.charge <= 0)) //Check if we ran out of power
change_power_status(FALSE)
return FALSE
cell.use(0.005 * STANDARD_CELL_RATE * seconds_per_tick) //Basic cell goes for like 200 seconds, bluespace for 8000
if(!reagents.total_volume)
return FALSE
var/max_temp = min(500 + (500 * (0.2 * cell.rating)), 1000) // 373 to 1000
reagents.adjust_thermal_energy(0.4 * cell.maxcharge * reagents.total_volume * seconds_per_tick, max_temp = max_temp) // 4 kelvin every tick on a basic cell. 160k on bluespace
reagents.handle_reactions()
update_appearance()
if(reagents.chem_temp >= max_temp)
change_power_status(FALSE)
audible_message(span_notice("The Mauna Mug lets out a happy beep and turns off!"))
playsound(src, 'sound/machines/chime.ogg', 50)
/obj/item/reagent_containers/cup/maunamug/Destroy()
if(cell)
QDEL_NULL(cell)
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/reagent_containers/cup/maunamug/item_ctrl_click(mob/user)
if(on)
change_power_status(FALSE)
else
if(!cell || cell.charge <= 0)
return FALSE //No power, so don't turn on
change_power_status(TRUE)
return CLICK_ACTION_SUCCESS
/obj/item/reagent_containers/cup/maunamug/proc/change_power_status(status)
on = status
if(on)
START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj, src)
update_appearance()
/obj/item/reagent_containers/cup/maunamug/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
open = !open
to_chat(user, span_notice("You screw the battery case on [src] [open ? "open" : "closed"] ."))
update_appearance()
/obj/item/reagent_containers/cup/maunamug/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
add_fingerprint(user)
if(!istype(I, /obj/item/stock_parts/power_store/cell))
return ..()
if(!open)
to_chat(user, span_warning("The battery case must be open to insert a power cell!"))
return FALSE
if(cell)
to_chat(user, span_warning("There is already a power cell inside!"))
return FALSE
else if(!user.transferItemToLoc(I, src))
return
cell = I
user.visible_message(span_notice("[user] inserts a power cell into [src]."), span_notice("You insert the power cell into [src]."))
update_appearance()
/obj/item/reagent_containers/cup/maunamug/attack_hand(mob/living/user, list/modifiers)
if(cell && open)
user.put_in_hands(cell)
cell = null
to_chat(user, span_notice("You remove the power cell from [src]."))
on = FALSE
update_appearance()
return TRUE
return ..()
/obj/item/reagent_containers/cup/maunamug/update_icon_state()
if(open)
icon_state = "[base_icon_state][cell ? null : "_no"]_bat"
return ..()
icon_state = "[base_icon_state][on ? "_on" : null]"
return ..()
/obj/item/reagent_containers/cup/maunamug/update_overlays()
. = ..()
if(!reagents.total_volume || reagents.chem_temp < 400)
return
var/intensity = (reagents.chem_temp - 400) * 1 / 600 //Get the opacity of the incandescent overlay. Ranging from 400 to 1000
var/mutable_appearance/mug_glow = mutable_appearance(icon, "maunamug_incand")
mug_glow.alpha = 255 * intensity
. += mug_glow
code/modules/reagents/reagent_containers/misc.dm → code/modules/reagents/reagent_containers/rag.dm
-118
View File
@@ -1,121 +1,3 @@
/obj/item/reagent_containers/cup/maunamug
name = "mauna mug"
desc = "A drink served in a classy mug. Now with built-in heating!"
icon = 'icons/obj/devices/mauna_mug.dmi'
icon_state = "maunamug"
base_icon_state = "maunamug"
spillable = TRUE
reagent_flags = OPENCONTAINER
fill_icon_state = "maunafilling"
fill_icon_thresholds = list(25)
var/obj/item/stock_parts/power_store/cell
var/open = FALSE
var/on = FALSE
/obj/item/reagent_containers/cup/maunamug/Initialize(mapload, vol)
. = ..()
cell = new /obj/item/stock_parts/power_store/cell(src)
/obj/item/reagent_containers/cup/maunamug/get_cell()
return cell
/obj/item/reagent_containers/cup/maunamug/examine(mob/user)
. = ..()
. += span_notice("The status display reads: Current temperature: <b>[reagents.chem_temp]K</b> Current Charge:[cell ? "[cell.charge / cell.maxcharge * 100]%" : "No cell found"].")
if(open)
. += span_notice("The battery case is open.")
if(cell && cell.charge > 0)
. += span_notice("<b>Ctrl+Click</b> to toggle the power.")
/obj/item/reagent_containers/cup/maunamug/process(seconds_per_tick)
..()
if(on && (!cell || cell.charge <= 0)) //Check if we ran out of power
change_power_status(FALSE)
return FALSE
cell.use(0.005 * STANDARD_CELL_RATE * seconds_per_tick) //Basic cell goes for like 200 seconds, bluespace for 8000
if(!reagents.total_volume)
return FALSE
var/max_temp = min(500 + (500 * (0.2 * cell.rating)), 1000) // 373 to 1000
reagents.adjust_thermal_energy(0.4 * cell.maxcharge * reagents.total_volume * seconds_per_tick, max_temp = max_temp) // 4 kelvin every tick on a basic cell. 160k on bluespace
reagents.handle_reactions()
update_appearance()
if(reagents.chem_temp >= max_temp)
change_power_status(FALSE)
audible_message(span_notice("The Mauna Mug lets out a happy beep and turns off!"))
playsound(src, 'sound/machines/chime.ogg', 50)
/obj/item/reagent_containers/cup/maunamug/Destroy()
if(cell)
QDEL_NULL(cell)
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/reagent_containers/cup/maunamug/item_ctrl_click(mob/user)
if(on)
change_power_status(FALSE)
else
if(!cell || cell.charge <= 0)
return FALSE //No power, so don't turn on
change_power_status(TRUE)
return CLICK_ACTION_SUCCESS
/obj/item/reagent_containers/cup/maunamug/proc/change_power_status(status)
on = status
if(on)
START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj, src)
update_appearance()
/obj/item/reagent_containers/cup/maunamug/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
open = !open
to_chat(user, span_notice("You screw the battery case on [src] [open ? "open" : "closed"] ."))
update_appearance()
/obj/item/reagent_containers/cup/maunamug/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
add_fingerprint(user)
if(!istype(I, /obj/item/stock_parts/power_store/cell))
return ..()
if(!open)
to_chat(user, span_warning("The battery case must be open to insert a power cell!"))
return FALSE
if(cell)
to_chat(user, span_warning("There is already a power cell inside!"))
return FALSE
else if(!user.transferItemToLoc(I, src))
return
cell = I
user.visible_message(span_notice("[user] inserts a power cell into [src]."), span_notice("You insert the power cell into [src]."))
update_appearance()
/obj/item/reagent_containers/cup/maunamug/attack_hand(mob/living/user, list/modifiers)
if(cell && open)
user.put_in_hands(cell)
cell = null
to_chat(user, span_notice("You remove the power cell from [src]."))
on = FALSE
update_appearance()
return TRUE
return ..()
/obj/item/reagent_containers/cup/maunamug/update_icon_state()
if(open)
icon_state = "[base_icon_state][cell ? null : "_no"]_bat"
return ..()
icon_state = "[base_icon_state][on ? "_on" : null]"
return ..()
/obj/item/reagent_containers/cup/maunamug/update_overlays()
. = ..()
if(!reagents.total_volume || reagents.chem_temp < 400)
return
var/intensity = (reagents.chem_temp - 400) * 1 / 600 //Get the opacity of the incandescent overlay. Ranging from 400 to 1000
var/mutable_appearance/mug_glow = mutable_appearance(icon, "maunamug_incand")
mug_glow.alpha = 255 * intensity
. += mug_glow
/obj/item/rag
name = "damp rag"
desc = "For cleaning up messes, you suppose."