cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-29 20:27:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Early Assets, Lateloaded Assets, and Debugging Tools (#4696)

Browse Source 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Various asset systems I want in before more TGUI work. and also
byond-tracy support... and also light update debugging...
## Changelog
🆑
tweak: Chem Master UI has been reworked slightly.
This commit is contained in:
Zandario
2022-11-20 17:36:24 -07:00
committed by GitHub
parent d477ee4e43
commit 7bf4c2a34f
191 changed files with 2507 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/asset_cache/assets/chemistry/bottles.dm
+8
View File
@@ -0,0 +1,8 @@
/datum/asset/spritesheet/simple/bottles
name = "bottles"
assets = list(
"bottle1" = 'icons/runtime/assets/medical/bottles/bottle1.png',
"bottle2" = 'icons/runtime/assets/medical/bottles/bottle2.png',
"bottle3" = 'icons/runtime/assets/medical/bottles/bottle3.png',
"bottle4" = 'icons/runtime/assets/medical/bottles/bottle4.png',
)
code/modules/asset_cache/assets/chemistry/patches.dm
+8
View File
@@ -0,0 +1,8 @@
/datum/asset/spritesheet/simple/patches
name = "patches"
assets = list(
"patch" = 'icons/runtime/assets/medical/patches/patch.png',
"patch_brute" = 'icons/runtime/assets/medical/patches/patch_brute.png',
"patch_burn" = 'icons/runtime/assets/medical/patches/patch_burn.png',
"patch_both" = 'icons/runtime/assets/medical/patches/patch_both.png',
)
code/modules/asset_cache/assets/chemistry/pills.dm
+26
View File
@@ -0,0 +1,26 @@
/datum/asset/spritesheet/simple/pills
name = "pills"
assets = list(
"pill1" = 'icons/runtime/assets/medical/pills/pill1.png',
"pill2" = 'icons/runtime/assets/medical/pills/pill2.png',
"pill3" = 'icons/runtime/assets/medical/pills/pill3.png',
"pill4" = 'icons/runtime/assets/medical/pills/pill4.png',
"pill5" = 'icons/runtime/assets/medical/pills/pill5.png',
"pill6" = 'icons/runtime/assets/medical/pills/pill6.png',
"pill7" = 'icons/runtime/assets/medical/pills/pill7.png',
"pill8" = 'icons/runtime/assets/medical/pills/pill8.png',
"pill9" = 'icons/runtime/assets/medical/pills/pill9.png',
"pill10" = 'icons/runtime/assets/medical/pills/pill10.png',
"pill11" = 'icons/runtime/assets/medical/pills/pill11.png',
"pill12" = 'icons/runtime/assets/medical/pills/pill12.png',
"pill13" = 'icons/runtime/assets/medical/pills/pill13.png',
"pill14" = 'icons/runtime/assets/medical/pills/pill14.png',
"pill15" = 'icons/runtime/assets/medical/pills/pill15.png',
"pill16" = 'icons/runtime/assets/medical/pills/pill16.png',
"pill17" = 'icons/runtime/assets/medical/pills/pill17.png',
"pill18" = 'icons/runtime/assets/medical/pills/pill18.png',
"pill19" = 'icons/runtime/assets/medical/pills/pill19.png',
"pill20" = 'icons/runtime/assets/medical/pills/pill20.png',
"pill21" = 'icons/runtime/assets/medical/pills/pill21.png',
"pill22" = 'icons/runtime/assets/medical/pills/pill22.png',
)
code/modules/asset_cache/assets/condiments.dm
+16 -16
View File
@@ -1,20 +1,20 @@
/datum/asset/spritesheet/simple/condiments
name = "condiments"
assets = list(
CONDIMASTER_STYLE_FALLBACK = 'icons/ui_icons/condiments/emptycondiment.png',
"enzyme" = 'icons/ui_icons/condiments/enzyme.png',
"flour" = 'icons/ui_icons/condiments/flour.png',
"mayonnaise" = 'icons/ui_icons/condiments/mayonnaise.png',
"milk" = 'icons/ui_icons/condiments/milk.png',
"blackpepper" = 'icons/ui_icons/condiments/peppermillsmall.png',
"rice" = 'icons/ui_icons/condiments/rice.png',
"sodiumchloride" = 'icons/ui_icons/condiments/saltshakersmall.png',
"soymilk" = 'icons/ui_icons/condiments/soymilk.png',
"soysauce" = 'icons/ui_icons/condiments/soysauce.png',
"sugar" = 'icons/ui_icons/condiments/sugar.png',
"ketchup" = 'icons/ui_icons/condiments/ketchup.png',
"capsaicin" = 'icons/ui_icons/condiments/hotsauce.png',
"frostoil" = 'icons/ui_icons/condiments/coldsauce.png',
"bbqsauce" = 'icons/ui_icons/condiments/bbqsauce.png',
"cornoil" = 'icons/ui_icons/condiments/oliveoil.png',
CONDIMASTER_STYLE_FALLBACK = 'icons/runtime/assets/condiments/emptycondiment.png',
"enzyme" = 'icons/runtime/assets/condiments/enzyme.png',
"flour" = 'icons/runtime/assets/condiments/flour.png',
"mayonnaise" = 'icons/runtime/assets/condiments/mayonnaise.png',
"milk" = 'icons/runtime/assets/condiments/milk.png',
"blackpepper" = 'icons/runtime/assets/condiments/peppermillsmall.png',
"rice" = 'icons/runtime/assets/condiments/rice.png',
"sodiumchloride" = 'icons/runtime/assets/condiments/saltshakersmall.png',
"soymilk" = 'icons/runtime/assets/condiments/soymilk.png',
"soysauce" = 'icons/runtime/assets/condiments/soysauce.png',
"sugar" = 'icons/runtime/assets/condiments/sugar.png',
"ketchup" = 'icons/runtime/assets/condiments/ketchup.png',
"capsaicin" = 'icons/runtime/assets/condiments/hotsauce.png',
"frostoil" = 'icons/runtime/assets/condiments/coldsauce.png',
"bbqsauce" = 'icons/runtime/assets/condiments/bbqsauce.png',
"cornoil" = 'icons/runtime/assets/condiments/oliveoil.png',
)
code/modules/asset_cache/assets/patches.dm
-8
View File
@@ -1,8 +0,0 @@
/datum/asset/spritesheet/simple/patches
name = "patches"
assets = list(
"bandaid" = 'icons/ui_icons/patches/bandaid.png',
"bandaid_brute" = 'icons/ui_icons/patches/bandaid_brute.png',
"bandaid_burn" = 'icons/ui_icons/patches/bandaid_burn.png',
"bandaid_both" = 'icons/ui_icons/patches/bandaid_both.png'
)
code/modules/asset_cache/assets/pills.dm
-40
View File
@@ -1,40 +0,0 @@
/datum/asset/simple/namespaced/chem_master
keep_local_name = TRUE
/datum/asset/simple/namespaced/chem_master/register()
for(var/i = 1 to 24)
assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]")
for(var/i = 1 to 4)
assets["bottle-[i].png"] = icon('icons/obj/chemical.dmi', "bottle-[i]")
return ..()
/*
/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',
)
*/