shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2405

Browse Source
This commit is contained in:
kevinz000
2017-08-29 22:27:10 -07:00
parent 5dc670e282 301a581e64
commit 5c7b743cfa
13 changed files with 2388 additions and 2374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/disposal-unit.dm
+3
View File
@@ -247,6 +247,9 @@
AM.forceMove(T)
..()
/obj/machinery/disposal/get_dumping_location(obj/item/storage/source,mob/user)
return src
//How disposal handles getting a storage dump from a storage object
/obj/machinery/disposal/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
for(var/obj/item/I in src_object)
code/modules/research/stock_parts.dm
+5 -4
View File
@@ -44,12 +44,13 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/pshoom.ogg'
alt_sound = 'sound/items/pshoom_2.ogg'
/obj/item/storage/part_replacer/bluespace/content_can_dump(atom/dest_object, mob/user)
/obj/item/storage/part_replacer/bluespace/dump_content_at(atom/dest_object, mob/user)
if(Adjacent(user))
if(get_dist(user, dest_object) < 8)
if(dest_object.storage_contents_dump_act(src, user))
var/atom/dumping_location = dest_object.get_dumping_location()
if(get_dist(user, dumping_location) < 8)
if(dumping_location.storage_contents_dump_act(src, user))
play_rped_sound()
user.Beam(dest_object,icon_state="rped_upgrade",time=5)
user.Beam(dumping_location,icon_state="rped_upgrade",time=5)
return 1
to_chat(user, "The [src.name] buzzes.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)