cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nano Is Dead

Browse Source
This commit is contained in:
AffectedArc07
2020-11-21 09:46:50 +00:00
parent 3613057b9d
commit 984ac231e0
121 changed files with 43 additions and 26087 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/marker_beacons.dm
+4 -4
View File
@@ -58,10 +58,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
transfer_fingerprints_to(M)
/obj/item/stack/marker_beacon/AltClick(mob/living/user)
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
return
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
return
if(input_color)
picked_color = input_color
@@ -130,10 +130,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
/obj/structure/marker_beacon/AltClick(mob/living/user)
..()
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
return
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
if(!istype(user) || CanUseTopic(user, GLOB.physical_state) != STATUS_INTERACTIVE)
if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
return
if(input_color)
picked_color = input_color
code/modules/mining/machine_processing.dm
+3 -4
View File
@@ -31,16 +31,15 @@
return INITIALIZE_HINT_QDEL
/obj/machinery/mineral/processing_unit_console/attack_ghost(mob/user)
return ui_interact(user)
return open_ui(user)
/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
if(..())
return TRUE
return ui_interact(user)
return open_ui(user)
/obj/machinery/mineral/processing_unit_console/ui_interact(mob/user)
. = ..()
/obj/machinery/mineral/processing_unit_console/proc/open_ui(mob/user)
if(!machine)
return