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

Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

Browse Source
This commit is contained in:
Waterpig
2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/core/component_printer.dm
+12
View File
@@ -117,7 +117,11 @@
materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]")
return new design.build_path(drop_location())
<<<<<<< HEAD
/obj/machinery/component_printer/ui_act(action, list/params)
=======
/obj/machinery/component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
@@ -276,7 +280,11 @@
get_asset_datum(/datum/asset/spritesheet/research_designs)
)
<<<<<<< HEAD
/obj/machinery/debug_component_printer/ui_act(action, list/params)
=======
/obj/machinery/debug_component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
@@ -364,7 +372,11 @@
update_static_data_for_all_viewers()
<<<<<<< HEAD
/obj/machinery/module_duplicator/ui_act(action, list/params)
=======
/obj/machinery/module_duplicator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
code/modules/wiremod/core/integrated_circuit.dm
+3
View File
@@ -264,6 +264,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
to_chat(user, span_danger("You can't insert multiple instances of this component into the same circuit!"))
return FALSE
<<<<<<< HEAD
// SKYRAT ADDITION BEGIN - This is required since we have two reagent components, and the BCI only allows one active
if(to_add.circuit_flags & CIRCUIT_REAGENT_CONTAINER_TYPE)
if(shell && shell.reagents)
@@ -271,6 +272,8 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
return FALSE
// SKYRAT ADDITION END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
var/success = FALSE
if(user)
success = user.transferItemToLoc(to_add, src)