cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small dish drive improvements

Browse Source
This commit is contained in:
oranges
2019-06-27 20:32:17 +12:00
committed by Nich
parent 87d01d46ea
commit 21fee12498
3 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
code/game/machinery/dish_drive.dm
View File

@@ -10,7 +10,7 @@
density = FALSE density = FALSE
circuit = /obj/item/circuitboard/machine/dish_drive circuit = /obj/item/circuitboard/machine/dish_drive
pass_flags = PASSTABLE pass_flags = PASSTABLE
var/static/list/item_types = list(/obj/item/trash/waffles, var/static/list/collectable_items = list(/obj/item/trash/waffles,
/obj/item/trash/plate, /obj/item/trash/plate,
/obj/item/trash/tray, /obj/item/trash/tray,
/obj/item/reagent_containers/glass/bowl, /obj/item/reagent_containers/glass/bowl,
@@ -18,6 +18,11 @@
/obj/item/kitchen/fork, /obj/item/kitchen/fork,
/obj/item/shard, /obj/item/shard,
/obj/item/broken_bottle) /obj/item/broken_bottle)
var/static/list/disposable_items = list(/obj/item/trash/waffles,
/obj/item/trash/plate,
/obj/item/trash/tray,
/obj/item/shard,
/obj/item/broken_bottle)
var/time_since_dishes = 0 var/time_since_dishes = 0
var/suction_enabled = TRUE var/suction_enabled = TRUE
var/transmit_enabled = TRUE var/transmit_enabled = TRUE
@@ -42,7 +47,7 @@
flick("synthesizer_beam", src) flick("synthesizer_beam", src)
/obj/machinery/dish_drive/attackby(obj/item/I, mob/living/user, params) /obj/machinery/dish_drive/attackby(obj/item/I, mob/living/user, params)
if(is_type_in_list(I, item_types) && user.a_intent != INTENT_HARM) if(is_type_in_list(I, collectable_items) && user.a_intent != INTENT_HARM)
if(!user.transferItemToLoc(I, src)) if(!user.transferItemToLoc(I, src))
return return
to_chat(user, "<span class='notice'>You put [I] in [src], and it's beamed into energy!</span>") to_chat(user, "<span class='notice'>You put [I] in [src], and it's beamed into energy!</span>")
@@ -81,7 +86,7 @@
if(!suction_enabled) if(!suction_enabled)
return return
for(var/obj/item/I in view(4, src)) for(var/obj/item/I in view(4, src))
if(is_type_in_list(I, item_types) && I.loc != src && (!I.reagents || !I.reagents.total_volume)) if(is_type_in_list(I, collectable_items) && I.loc != src && (!I.reagents || !I.reagents.total_volume))
if(I.Adjacent(src)) if(I.Adjacent(src))
visible_message("<span class='notice'>[src] beams up [I]!</span>") visible_message("<span class='notice'>[src] beams up [I]!</span>")
I.forceMove(src) I.forceMove(src)
@@ -109,13 +114,17 @@
visible_message("<span class='warning'>[src] buzzes. There are no disposal bins in range!</span>") visible_message("<span class='warning'>[src] buzzes. There are no disposal bins in range!</span>")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE)
return return
var/disposed = 0
for(var/obj/item/I in contents) for(var/obj/item/I in contents)
I.forceMove(bin) if(is_type_in_list(I, disposable_items))
use_power(active_power_usage) I.forceMove(bin)
visible_message("<span class='notice'>[src] [pick("whooshes", "bwooms", "fwooms", "pshooms")] and beams its stored dishes into the nearby [bin.name].</span>") use_power(active_power_usage)
playsound(src, 'sound/items/pshoom.ogg', 50, TRUE) disposed++
playsound(bin, 'sound/items/pshoom.ogg', 50, TRUE) if (disposed)
Beam(bin, icon_state = "rped_upgrade", time = 5) visible_message("<span class='notice'>[src] [pick("whooshes", "bwooms", "fwooms", "pshooms")] and beams [disposed] stored item\s into the nearby [bin.name].</span>")
bin.update_icon() playsound(src, 'sound/items/pshoom.ogg', 50, TRUE)
flick("synthesizer_beam", src) playsound(bin, 'sound/items/pshoom.ogg', 50, TRUE)
Beam(bin, icon_state = "rped_upgrade", time = 5)
bin.update_icon()
flick("synthesizer_beam", src)
time_since_dishes = world.time + 600 time_since_dishes = world.time + 600

16
code/game/objects/items/storage/boxes.dm
View File

@@ -1072,3 +1072,19 @@
/obj/item/stock_parts/micro_laser/quadultra = 3, /obj/item/stock_parts/micro_laser/quadultra = 3,
/obj/item/stock_parts/matter_bin/bluespace = 3) /obj/item/stock_parts/matter_bin/bluespace = 3)
generate_items_inside(items_inside,src) generate_items_inside(items_inside,src)
/obj/item/storage/box/dishdrive
name = "DIY Dish Drive Kit"
desc = "Contains everything you need to build your own Dish Drive!"
custom_premium_price = 200
/obj/item/storage/box/dishdrive/PopulateContents()
var/static/items_inside = list(
/obj/item/stack/sheet/metal/five = 1,
/obj/item/stack/cable_coil/five = 1,
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/matter_bin = 2,
/obj/item/screwdriver = 1)
generate_items_inside(items_inside,src)

6
code/modules/vending/wardrobes.dm
View File

@@ -233,7 +233,13 @@
/obj/item/clothing/suit/armor/vest/alt = 1, /obj/item/clothing/suit/armor/vest/alt = 1,
/obj/item/circuitboard/machine/dish_drive = 1, /obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/glasses/sunglasses/reagent = 1, /obj/item/clothing/glasses/sunglasses/reagent = 1,
<<<<<<< HEAD
/obj/item/storage/belt/bandolier = 1) // yogs - removed pet collar /obj/item/storage/belt/bandolier = 1) // yogs - removed pet collar
=======
/obj/item/clothing/neck/petcollar = 1,
/obj/item/storage/belt/bandolier = 1)
premium = list(/obj/item/storage/box/dishdrive = 1)
>>>>>>> 2bb0e101e4... Merge pull request #44756 from Mickyan/dishdrive_stuff
refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
payment_department = ACCOUNT_SRV payment_department = ACCOUNT_SRV
/obj/item/vending_refill/wardrobe/bar_wardrobe /obj/item/vending_refill/wardrobe/bar_wardrobe