cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit bd470fd0276e83fa1516cc1b966308165d081b1b
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue Apr 10 20:45:00 2018 +0300

    Update painter_vr.dm

commit 12e39bcec9b717d477a64aca0f8dfe917917986b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 9 09:34:50 2018 +0300

    Update painter_vr.dm
This commit is contained in:
Verkister
2018-04-10 21:27:47 +03:00
parent 661b2946ff
commit 7dd311d088
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/painter_vr.dm
View File

@@ -70,8 +70,9 @@
dat += "<A href='?src=\ref[src];clear=1'>Remove paintjob.</A><BR><BR>" dat += "<A href='?src=\ref[src];clear=1'>Remove paintjob.</A><BR><BR>"
dat += "<A href='?src=\ref[src];eject=1'>Eject item.</A><BR><BR>" dat += "<A href='?src=\ref[src];eject=1'>Eject item.</A><BR><BR>"
user << browse(dat, "window=colormate") var/datum/browser/menu = new(user, "colormate","Color Mate Control Panel", 400, 600, src)
onclose(user, "colormate") menu.set_content(dat)
menu.open()
return return
/obj/machinery/gear_painter/Topic(href, href_list) /obj/machinery/gear_painter/Topic(href, href_list)
@@ -81,6 +82,9 @@
usr.set_machine(src) usr.set_machine(src)
add_fingerprint(usr) add_fingerprint(usr)
if(href_list["close"])
return
if(href_list["select"]) if(href_list["select"])
var/newcolor = input(usr, "Choose a color.", "", activecolor) as color|null var/newcolor = input(usr, "Choose a color.", "", activecolor) as color|null
if(newcolor) if(newcolor)
@@ -98,7 +102,7 @@
if(href_list["eject"]) if(href_list["eject"])
for(var/atom/movable/O in processing) for(var/atom/movable/O in processing)
O.loc = src.loc O.forceMove(drop_location())
processing.Cut() processing.Cut()
update_icon() update_icon()