cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Plumbing Fixes & Pill Press UI Changes (#79059)

Browse Source 
## About The Pull Request
1. Fixes #79051
It's a consequence of floating-point math. We round it to 2 decimal
places to display results like 50 but in fact its actual value is
something like 49.999... something. So, we also shift up our
expectations and call it a day.
2. Made a lot of variables defines and lists static to save memory for
plumbing pill press and moved global lists to it's global list folder
3. Copied over chem master patch & pill designs over too plumbing press
and removed the old designs & resized the UI

## Changelog
🆑
fix: plumbing pill press & bottler won't stop when processing 50 unit
bottles
code: made a lot of variables defines and lists static to save memory
for plumbing pill press. Moved global lists to it's rightful
place
code: copied over chem master pill & patch designs over to plumbing pill
press and removed the old designs. resized UI
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SyncIt21
2023-10-20 11:22:16 +05:30
committed by GitHub
parent b7426d0866
commit df508a51b2
57 changed files with 302 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/asset_cache/assets/chemmaster.dm
+2 -2
View File
@@ -4,8 +4,8 @@
/datum/asset/spritesheet/chemmaster/create_spritesheets()
var/list/ids = list()
for(var/category in GLOB.chem_master_containers)
for(var/obj/item/reagent_containers/container as anything in GLOB.chem_master_containers[category])
for(var/category in GLOB.reagent_containers)
for(var/obj/item/reagent_containers/container as anything in GLOB.reagent_containers[category])
var/icon_file = initial(container.icon)
var/icon_state = initial(container.icon_state)
var/id = sanitize_css_class_name("[container]")
code/modules/asset_cache/assets/patches.dm
-25
View File
@@ -1,25 +0,0 @@
/datum/asset/spritesheet/simple/patches
name = "patches"
assets = list(
"bandaid_1" = 'icons/ui_icons/patches/bandaid_1.png',
"bandaid_2" = 'icons/ui_icons/patches/bandaid_2.png',
"bandaid_3" = 'icons/ui_icons/patches/bandaid_3.png',
"bandaid_4" = 'icons/ui_icons/patches/bandaid_4.png',
"bandaid_blank" = 'icons/ui_icons/patches/bandaid_blank.png',
"bandaid_both" = 'icons/ui_icons/patches/bandaid_both.png',
"bandaid_brute" = 'icons/ui_icons/patches/bandaid_brute.png',
"bandaid_brute_2" = 'icons/ui_icons/patches/bandaid_brute_2.png',
"bandaid_burn" = 'icons/ui_icons/patches/bandaid_burn.png',
"bandaid_burn_2" = 'icons/ui_icons/patches/bandaid_burn_2.png',
"bandaid_clown" = 'icons/ui_icons/patches/bandaid_clown.png',
"bandaid_colonthree" = 'icons/ui_icons/patches/bandaid_colonthree.png',
"bandaid_exclaimationpoint" = 'icons/ui_icons/patches/bandaid_exclaimationpoint.png',
"bandaid_mix" = 'icons/ui_icons/patches/bandaid_mix.png',
"bandaid_monke" = 'icons/ui_icons/patches/bandaid_monke.png',
"bandaid_msic" = 'icons/ui_icons/patches/bandaid_msic.png',
"bandaid_questionmark" = 'icons/ui_icons/patches/bandaid_questionmark.png',
"bandaid_suffocation" = 'icons/ui_icons/patches/bandaid_suffocation.png',
"bandaid_suffocation_2" = 'icons/ui_icons/patches/bandaid_suffocation_2.png',
"bandaid_toxin" = 'icons/ui_icons/patches/bandaid_toxin.png',
"bandaid_toxin_2" = 'icons/ui_icons/patches/bandaid_toxin_2.png',
)
code/modules/asset_cache/assets/pills.dm
-26
View File
@@ -1,26 +0,0 @@
/datum/asset/spritesheet/simple/pills
name = "pills"
assets = list(
"pill1" = 'icons/ui_icons/pills/pill1.png',
"pill2" = 'icons/ui_icons/pills/pill2.png',
"pill3" = 'icons/ui_icons/pills/pill3.png',
"pill4" = 'icons/ui_icons/pills/pill4.png',
"pill5" = 'icons/ui_icons/pills/pill5.png',
"pill6" = 'icons/ui_icons/pills/pill6.png',
"pill7" = 'icons/ui_icons/pills/pill7.png',
"pill8" = 'icons/ui_icons/pills/pill8.png',
"pill9" = 'icons/ui_icons/pills/pill9.png',
"pill10" = 'icons/ui_icons/pills/pill10.png',
"pill11" = 'icons/ui_icons/pills/pill11.png',
"pill12" = 'icons/ui_icons/pills/pill12.png',
"pill13" = 'icons/ui_icons/pills/pill13.png',
"pill14" = 'icons/ui_icons/pills/pill14.png',
"pill15" = 'icons/ui_icons/pills/pill15.png',
"pill16" = 'icons/ui_icons/pills/pill16.png',
"pill17" = 'icons/ui_icons/pills/pill17.png',
"pill18" = 'icons/ui_icons/pills/pill18.png',
"pill19" = 'icons/ui_icons/pills/pill19.png',
"pill20" = 'icons/ui_icons/pills/pill20.png',
"pill21" = 'icons/ui_icons/pills/pill21.png',
"pill22" = 'icons/ui_icons/pills/pill22.png',
)