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

Squashed commit of the following:

Browse Source 
commit f55edb98499b600186be9f58c0d245b454479b74
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 17:05:19 2018 +0300

    we'll see about that whitelist crap later then

commit 186ce2aba274c4009c42a730d1ba7c67dddf8ea6
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:32:08 2018 +0300

    screw you too travis

commit 470789300bda3949de4027dc8e2c25ae8427eaae
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:10:29 2018 +0300

    Update painter_vr.dm

commit e9dee86b0cb84172c95f3a91ba73ce0b2661820c
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 15:51:37 2018 +0300

    Update painter_vr.dm
This commit is contained in:
Verkister
2018-04-09 09:32:58 +03:00
parent e6e755d09d
commit 661b2946ff
1 changed files with 19 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,82 +8,10 @@
var/list/processing = list()
var/activecolor = "#FFFFFF"
var/list/allowed_types = list(
/*
/obj/item/clothing/under/bathrobe,
/obj/item/clothing/under/cheongsam,
/obj/item/clothing/under/color/white,
/obj/item/clothing/under/dress/white,
/obj/item/clothing/under/dress/white2,
/obj/item/clothing/under/dress/white3,
/obj/item/clothing/under/dress/white4,
/obj/item/clothing/under/medigown,
/obj/item/clothing/under/pants/white,
/obj/item/clothing/under/pants/track/white,
/obj/item/clothing/under/pants/baggy/white,
/obj/item/clothing/under/pants/yogapants,
/obj/item/clothing/under/seromi/smock/white,
/obj/item/clothing/under/seromi/undercoat/white_grey,
/obj/item/clothing/under/shorts/white,
/obj/item/clothing/under/swimsuit/white,
/obj/item/clothing/under/wedding/bride_white,
/obj/item/clothing/suit/chef,
/obj/item/clothing/suit/holidaypriest,
/obj/item/clothing/suit/kimono,
/obj/item/clothing/suit/storage/duster,
/obj/item/clothing/suit/storage/hazardvest/white,
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
/obj/item/clothing/suit/storage/seromi/cloak/white_grey,
/obj/item/clothing/suit/storage/snowsuit,
/obj/item/clothing/suit/storage/toggle/dress,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/med_dep_jacket,
/obj/item/clothing/suit/storage/toggle/peacoat,
/obj/item/clothing/suit/storage/toggle/track/white,
/obj/item/clothing/suit/straight_jacket,
/obj/item/clothing/suit/whitedress,
/obj/item/clothing/shoes/athletic,
/obj/item/clothing/shoes/flipflop,
/obj/item/clothing/shoes/footwraps,
/obj/item/clothing/shoes/hitops,
/obj/item/clothing/shoes/skater,
/obj/item/clothing/shoes/slippers,
/obj/item/clothing/shoes/slippers_worn,
/obj/item/clothing/shoes/white,
/obj/item/clothing/head/beretg,
/obj/item/clothing/head/chefhat,
/obj/item/clothing/head/flatcap/grey,
/obj/item/clothing/head/collectable/chef,
/obj/item/clothing/head/collectable/rabbitears,
/obj/item/clothing/head/collectable/paper,
/obj/item/clothing/head/chaplain_hood/whiteout,
/obj/item/clothing/head/fluff/headbando,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/headband/maid,
/obj/item/clothing/head/hijab,
/obj/item/clothing/head/kippa,
/obj/item/clothing/head/nursehat,
/obj/item/clothing/head/philosopher_wig,
/obj/item/clothing/head/pin/bow,
/obj/item/clothing/head/pin/flower/white,
/obj/item/clothing/head/powdered_wig,
/obj/item/clothing/head/rabbitears,
/obj/item/clothing/head/soft/mime,
/obj/item/clothing/head/turban,
/obj/item/clothing/gloves/color,
/obj/item/clothing/gloves/evening,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/gloves/white,
/obj/item/clothing/accessory/armband/med/color,
/obj/item/clothing/accessory/flops,
/obj/item/clothing/accessory/scarf/white,
/obj/item/clothing/accessory/storage/white_drop_pouches,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/clothing/accessory/tie/white
*/
/obj/item/clothing,
/obj/item/weapon/storage/backpack,
/obj/item/weapon/storage/belt
)
/obj/item/clothing,
/obj/item/weapon/storage/backpack,
/obj/item/weapon/storage/belt
)
/obj/machinery/gear_painter/update_icon()
if(panel_open)
@@ -97,7 +25,7 @@
/obj/machinery/gear_painter/Destroy()
for(var/atom/movable/O in processing)
O.loc = src.loc
O.forceMove(drop_location())
processing.Cut()
return ..()
@@ -113,20 +41,21 @@
return
if(is_type_in_list(W, allowed_types) && !inoperable())
user.drop_item()
W.loc = src
user.visible_message("<span class='notice'>[user] inserts \the [W] into the Color Mate receptable.</span>")
user.drop_from_inventory(W)
W.forceMove(src)
processing |= W
else
..()
update_icon()
/obj/machinery/gear_painter/attack_hand(mob/user as mob)
if(!inoperable())
interact(user)
update_icon()
if(..())
return
interact(user)
/obj/machinery/gear_painter/interact(mob/user as mob)
if(stat & BROKEN)
if(inoperable())
return
user.set_machine(src)
var/dat = "<TITLE>Color Mate Control Panel</TITLE><BR>"
@@ -138,6 +67,7 @@
dat += "<A href='?src=\ref[src];select=1'>Select new color.</A><BR>"
dat += "Color: <font color='[activecolor]'>&#9899;</font>"
dat += "<A href='?src=\ref[src];paint=1'>Apply new color.</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>"
user << browse(dat, "window=colormate")
@@ -161,10 +91,15 @@
O.color = activecolor
playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1)
if(href_list["clear"])
for(var/atom/movable/O in processing)
O.color = initial(O.color)
playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1)
if(href_list["eject"])
for(var/atom/movable/O in processing)
O.loc = src.loc
processing.Cut()
update_icon()
updateUsrDialog()
updateUsrDialog()