diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 6e98ec491f6..7cec1f23787 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1507,13 +1507,13 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) . += new /obj/screen/plane_master{plane = PLANE_ADMIN3} //For admin use . += new /obj/screen/plane_master{plane = PLANE_MESONS} //Meson-specific things like open ceilings. - . += new /obj/screen/plane_master{plane = PLANE_BUILDMODE} //Things that only show up while in build mode + // . += new /obj/screen/plane_master{plane = PLANE_BUILDMODE} //Things that only show up while in build mode // Real tangible stuff planes . += new /obj/screen/plane_master/main{plane = TURF_PLANE} . += new /obj/screen/plane_master/main{plane = OBJ_PLANE} . += new /obj/screen/plane_master/main{plane = MOB_PLANE} - . += new /obj/screen/plane_master/cloaked //Cloaked atoms! + // . += new /obj/screen/plane_master/cloaked //Cloaked atoms! //VOREStation Add - Random other plane masters . += new /obj/screen/plane_master{plane = PLANE_CH_STATUS_R} //Right-side status icon diff --git a/code/game/objects/items/weapons/circuitboards/other.dm b/code/game/objects/items/weapons/circuitboards/other.dm index 7698e3bed3a..2d71a84725e 100644 --- a/code/game/objects/items/weapons/circuitboards/other.dm +++ b/code/game/objects/items/weapons/circuitboards/other.dm @@ -8,3 +8,12 @@ name = T_BOARD("AI core") origin_tech = list(TECH_DATA = 4, TECH_BIO = 2) board_type = "other" + +/obj/item/circuitboard/chem_master + name = T_BOARD("ChemMaster 3000") + build_path = /obj/machinery/chem_master + board_type = new /datum/frame/frame_types/machine + origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2) + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 2) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 010fb3fc386..1d991d7f373 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -535,3 +535,43 @@ ..() */ + +//Pill sprites for UIs +/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 ..() + +// Nanomaps +/datum/asset/simple/nanomaps + // It REALLY doesnt matter too much if these arent up to date + // They are relatively big + assets = list( + // VOREStation Edit: We don't need Southern Cross + // "southern_cross_nanomap_z1.png" = 'icons/_nanomaps/southern_cross_nanomap_z1.png', + // "southern_cross_nanomap_z10.png" = 'icons/_nanomaps/southern_cross_nanomap_z10.png', + // "southern_cross_nanomap_z2.png" = 'icons/_nanomaps/southern_cross_nanomap_z2.png', + // "southern_cross_nanomap_z3.png" = 'icons/_nanomaps/southern_cross_nanomap_z3.png', + // "southern_cross_nanomap_z5.png" = 'icons/_nanomaps/southern_cross_nanomap_z5.png', + // "southern_cross_nanomap_z6.png" = 'icons/_nanomaps/southern_cross_nanomap_z6.png', + "tether_nanomap_z1.png" = 'icons/_nanomaps/tether_nanomap_z1.png', + "tether_nanomap_z2.png" = 'icons/_nanomaps/tether_nanomap_z2.png', + "tether_nanomap_z3.png" = 'icons/_nanomaps/tether_nanomap_z3.png', + "tether_nanomap_z4.png" = 'icons/_nanomaps/tether_nanomap_z4.png', + "tether_nanomap_z5.png" = 'icons/_nanomaps/tether_nanomap_z5.png', + "tether_nanomap_z6.png" = 'icons/_nanomaps/tether_nanomap_z6.png', + "tether_nanomap_z7.png" = 'icons/_nanomaps/tether_nanomap_z7.png', + "tether_nanomap_z8.png" = 'icons/_nanomaps/tether_nanomap_z8.png', + "tether_nanomap_z9.png" = 'icons/_nanomaps/tether_nanomap_z9.png', + "tether_nanomap_z10.png" = 'icons/_nanomaps/tether_nanomap_z10.png', + "tether_nanomap_z13.png" = 'icons/_nanomaps/tether_nanomap_z13.png', + "tether_nanomap_z14.png" = 'icons/_nanomaps/tether_nanomap_z14.png', + // VOREStation Edit End + ) diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index ede6054edd7..c705f92b064 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -82,7 +82,7 @@ /obj/machinery/chem_master/ui_assets(mob/user) return list( - get_asset_datum(/datum/asset/chem_master), + get_asset_datum(/datum/asset/simple/namespaced/chem_master), ) /obj/machinery/chem_master/ui_interact(mob/user, datum/tgui/ui = null) diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index 5034c7be9f8..d3dba6fad4e 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -4,3 +4,14 @@ diethylamine spawn_reagent = "diethylamine" plantbgone spawn_reagent = "plantbgone" mutagen spawn_reagent = "mutagen" + + //Biochem + nutriment spawn_reagent = "nutriment" + protein spawn_reagent = "protein" + + //Special Ops + biomass spawn_reagent = "biomass" + carthatoline spawn_reagent = "carthatoline" + corophizine spawn_reagent = "corophizine" + myelamine spawn_reagent = "myelamine" + osteodaxon spawn_reagent = "osteodaxon" diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 705768875c5..5de7dd772d5 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -74,15 +74,15 @@ // Subtype for glasses_state /datum/tgui_module/crew_monitor/glasses -/datum/tgui_module/crew_monitor/glasses/tgui_state(mob/user) +/datum/tgui_module/crew_monitor/glasses/ui_state(mob/user) return GLOB.tgui_glasses_state // Subtype for self_state /datum/tgui_module/crew_monitor/robot -/datum/tgui_module/crew_monitor/robot/tgui_state(mob/user) - return GLOB.tgui_self_state +/datum/tgui_module/crew_monitor/robot/ui_state(mob/user) + return GLOB.self_state // Subtype for nif_state /datum/tgui_module/crew_monitor/nif -/datum/tgui_module/crew_monitor/nif/tgui_state(mob/user) +/datum/tgui_module/crew_monitor/nif/ui_state(mob/user) return GLOB.tgui_nif_state diff --git a/code/modules/tgui/states/inventory_vr.dm b/code/modules/tgui/states/inventory_vr.dm index 81e4058cf97..b1a3fbc5ac8 100644 --- a/code/modules/tgui/states/inventory_vr.dm +++ b/code/modules/tgui/states/inventory_vr.dm @@ -1,5 +1,5 @@ -GLOBAL_DATUM_INIT(tgui_glasses_state, /datum/tgui_state/glasses_state, new) -/datum/tgui_state/glasses_state/can_use_topic(var/src_object, var/mob/user) +GLOBAL_DATUM_INIT(tgui_glasses_state, /datum/ui_state/glasses_state, new) +/datum/ui_state/glasses_state/can_use_topic(var/src_object, var/mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.glasses == src_object) @@ -7,8 +7,8 @@ GLOBAL_DATUM_INIT(tgui_glasses_state, /datum/tgui_state/glasses_state, new) return UI_CLOSE -GLOBAL_DATUM_INIT(tgui_nif_state, /datum/tgui_state/nif_state, new) -/datum/tgui_state/nif_state/can_use_topic(var/src_object, var/mob/user) +GLOBAL_DATUM_INIT(tgui_nif_state, /datum/ui_state/nif_state, new) +/datum/ui_state/nif_state/can_use_topic(var/src_object, var/mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.nif && H.nif.stat == NIF_WORKING && src_object == H.nif) @@ -17,8 +17,8 @@ GLOBAL_DATUM_INIT(tgui_nif_state, /datum/tgui_state/nif_state, new) return UI_CLOSE // This is slightly distinct from the module state, as it wants to update if not working -GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/tgui_state/nif_main_state, new) -/datum/tgui_state/nif_main_state/can_use_topic(var/src_object, var/mob/user) +GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/ui_state/nif_main_state, new) +/datum/ui_state/nif_main_state/can_use_topic(var/src_object, var/mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(!H.nif || src_object != H.nif) @@ -31,8 +31,8 @@ GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/tgui_state/nif_main_state, new) return UI_CLOSE -GLOBAL_DATUM_INIT(tgui_commlink_state, /datum/tgui_state/commlink_state, new) -/datum/tgui_state/commlink_state/can_use_topic(var/src_object, var/mob/user) +GLOBAL_DATUM_INIT(tgui_commlink_state, /datum/ui_state/commlink_state, new) +/datum/ui_state/commlink_state/can_use_topic(var/src_object, var/mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.nif && H.nif.stat == NIF_WORKING && H.nif.comm == src_object) diff --git a/nano/images/nanomapBackground.png b/nano/images/nanomapBackground.png deleted file mode 100644 index f3ead016196..00000000000 Binary files a/nano/images/nanomapBackground.png and /dev/null differ diff --git a/nano/images/nanomap_z1.png b/nano/images/nanomap_z1.png deleted file mode 100644 index e074f9aadf3..00000000000 Binary files a/nano/images/nanomap_z1.png and /dev/null differ diff --git a/nano/images/nanomap_z10.png b/nano/images/nanomap_z10.png deleted file mode 100644 index c8d1590e75f..00000000000 Binary files a/nano/images/nanomap_z10.png and /dev/null differ diff --git a/nano/images/nanomap_z1_tether.png b/nano/images/nanomap_z1_tether.png deleted file mode 100644 index 49a9c238c58..00000000000 Binary files a/nano/images/nanomap_z1_tether.png and /dev/null differ diff --git a/nano/images/nanomap_z2.png b/nano/images/nanomap_z2.png deleted file mode 100644 index b5df0716fb2..00000000000 Binary files a/nano/images/nanomap_z2.png and /dev/null differ diff --git a/nano/images/nanomap_z2_tether.png b/nano/images/nanomap_z2_tether.png deleted file mode 100644 index 36340c02f65..00000000000 Binary files a/nano/images/nanomap_z2_tether.png and /dev/null differ diff --git a/nano/images/nanomap_z3.png b/nano/images/nanomap_z3.png deleted file mode 100644 index 55b2ab125ca..00000000000 Binary files a/nano/images/nanomap_z3.png and /dev/null differ diff --git a/nano/images/nanomap_z3_tether.png b/nano/images/nanomap_z3_tether.png deleted file mode 100644 index ecbe6b12c6e..00000000000 Binary files a/nano/images/nanomap_z3_tether.png and /dev/null differ diff --git a/nano/images/nanomap_z4.png b/nano/images/nanomap_z4.png deleted file mode 100644 index 671c93be414..00000000000 Binary files a/nano/images/nanomap_z4.png and /dev/null differ diff --git a/nano/images/nanomap_z4_tether.png b/nano/images/nanomap_z4_tether.png deleted file mode 100644 index c2702db17c0..00000000000 Binary files a/nano/images/nanomap_z4_tether.png and /dev/null differ diff --git a/nano/images/nanomap_z5.png b/nano/images/nanomap_z5.png deleted file mode 100644 index ee00af5ef84..00000000000 Binary files a/nano/images/nanomap_z5.png and /dev/null differ diff --git a/nano/images/nanomap_z6.png b/nano/images/nanomap_z6.png deleted file mode 100644 index 4012e818f79..00000000000 Binary files a/nano/images/nanomap_z6.png and /dev/null differ diff --git a/nano/images/nanomap_z7.png b/nano/images/nanomap_z7.png deleted file mode 100644 index 0897f11b9a6..00000000000 Binary files a/nano/images/nanomap_z7.png and /dev/null differ diff --git a/nano/images/nanomap_z8.png b/nano/images/nanomap_z8.png deleted file mode 100644 index a74f77211f7..00000000000 Binary files a/nano/images/nanomap_z8.png and /dev/null differ diff --git a/nano/images/nanomap_z9.png b/nano/images/nanomap_z9.png deleted file mode 100644 index 6b766c4d28f..00000000000 Binary files a/nano/images/nanomap_z9.png and /dev/null differ diff --git a/sound/machines/reagent_dispense.ogg b/sound/machines/reagent_dispense.ogg new file mode 100644 index 00000000000..e94e8567c66 Binary files /dev/null and b/sound/machines/reagent_dispense.ogg differ diff --git a/tgui/.eslintrc.yml b/tgui/.eslintrc.yml index dd85d4ca159..f384182d80b 100644 --- a/tgui/.eslintrc.yml +++ b/tgui/.eslintrc.yml @@ -369,7 +369,7 @@ rules: # max-depth: error ## Enforce a maximum line length max-len: [error, { - code: 80, + code: 120, ## Ignore imports ignorePattern: '^(import\s.+\sfrom\s|.*require\()', ignoreUrls: true, diff --git a/tgui/package.json b/tgui/package.json index 7871fcbbafd..295271705cc 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -31,6 +31,7 @@ "jest-circus": "^26.6.3", "jsdom": "^16.5.3", "mini-css-extract-plugin": "^1.4.1", + "prop-types": "^15.7.2", "sass": "^1.32.8", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", diff --git a/tgui/packages/tgui/interfaces/ChemMaster.js b/tgui/packages/tgui/interfaces/ChemMaster.js index 49ab98250ba..c74428e58cb 100644 --- a/tgui/packages/tgui/interfaces/ChemMaster.js +++ b/tgui/packages/tgui/interfaces/ChemMaster.js @@ -125,11 +125,11 @@ const ChemMasterBeaker = (props, context) => { beakerLoaded beakerContents={beakerReagents} buttons={(chemical, i) => ( - +