mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] fixes one of my first ever coding sins here (#11720)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
85cd507d86
commit
65a5e0a614
@@ -85,12 +85,6 @@
|
||||
return
|
||||
tgui_interact(user)
|
||||
|
||||
/obj/machinery/gear_painter/tgui_interact(mob/user, datum/tgui/ui)
|
||||
ui = SStgui.try_update_ui(user, src, ui)
|
||||
if(!ui)
|
||||
ui = new(user, src, "ColorMate", name)
|
||||
ui.open()
|
||||
|
||||
/obj/machinery/gear_painter/proc/insert_mob(mob/victim, mob/user)
|
||||
if(inserted)
|
||||
return
|
||||
@@ -154,12 +148,13 @@
|
||||
if(temp)
|
||||
.["temp"] = temp
|
||||
if(inserted)
|
||||
.["item"] = list()
|
||||
.["item"]["name"] = inserted.name
|
||||
.["item"]["sprite"] = icon2base64(get_flat_icon(inserted,dir=SOUTH,no_anim=TRUE))
|
||||
.["item"]["preview"] = icon2base64(build_preview(user))
|
||||
.["item_name"] = inserted.name
|
||||
.["item_sprite"] = icon2base64(get_flat_icon(inserted,dir=SOUTH,no_anim=TRUE))
|
||||
.["item_preview"] = icon2base64(build_preview(user))
|
||||
else
|
||||
.["item"] = null
|
||||
.["item_name"] = null
|
||||
.["item_sprite"] = null
|
||||
.["item_preview"] = null
|
||||
|
||||
/obj/machinery/gear_painter/tgui_act(action, params, datum/tgui/ui)
|
||||
. = ..()
|
||||
@@ -176,7 +171,8 @@
|
||||
activecolor = chosen_color
|
||||
return TRUE
|
||||
if("paint")
|
||||
do_paint(ui.user)
|
||||
if(!do_paint(ui.user))
|
||||
return TRUE
|
||||
temp = "Painted Successfully!"
|
||||
return TRUE
|
||||
if("drop")
|
||||
@@ -236,7 +232,7 @@
|
||||
color_to_use = color_matrix_hsv(build_hue, build_sat, build_val)
|
||||
color_matrix_last = color_to_use
|
||||
if(!color_to_use || !check_valid_color(color_to_use, user))
|
||||
to_chat(user, span_notice("Invalid color."))
|
||||
temp = "Invalid color!"
|
||||
return FALSE
|
||||
inserted.add_atom_colour(color_to_use, FIXED_COLOUR_PRIORITY)
|
||||
playsound(src, 'sound/effects/spray3.ogg', 50, 1)
|
||||
|
||||
Reference in New Issue
Block a user