From b91e99507c7b9acd24ecc13c8d1824fc65ef113f Mon Sep 17 00:00:00 2001 From: LaharlMontogmmery Date: Sun, 21 Jun 2015 15:14:02 +0200 Subject: [PATCH] Base Changes for BlueSpace Content Transfer --- code/game/objects/items/weapons/storage/backpack.dm | 13 +++++++++++++ code/modules/research/stock_parts.dm | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index d8aed9fdd9d..6d627007af7 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -34,6 +34,8 @@ icon_state = "holdingpack" max_w_class = 5 max_combined_w_class = 35 + var/pshoom = 'sound/items/PSHOOM.ogg' + var/alt_sound = 'sound/items/PSHOOM_2.ogg' /obj/item/weapon/storage/backpack/holding/suicide_act(mob/user) user.visible_message("[user] is jumping into [src]! It looks like \he's trying to commit suicide.") @@ -50,6 +52,17 @@ return return ..() +/obj/item/weapon/storage/backpack/holding/content_can_dump(atom/dest_object, mob/user) + if(Adjacent(user)) + if(dest_object.storage_contents_dump_act(src, user)) + if(alt_sound && prob(1)) + playsound(src, alt_sound, 40, 1) + else + playsound(src, pshoom, 40, 1) + user.Beam(dest_object,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5) + return 1 + return 0 + /obj/item/weapon/storage/backpack/holding/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user) if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) var/safety = alert(user, "You feel this may not be the best idea.", "Put in [name]?", "Proceed", "Abort") diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 4f67a8aa16d..adc06b14686 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -42,6 +42,13 @@ pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/PSHOOM.ogg' alt_sound = 'sound/items/PSHOOM_2.ogg' +/obj/item/weapon/storage/part_replacer/bluespace/content_can_dump(atom/dest_object, mob/user) + if(Adjacent(user)) + if(dest_object.storage_contents_dump_act(src, user)) + play_rped_sound() + user.Beam(dest_object,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5) + return 1 + return 0 /obj/item/weapon/storage/part_replacer/proc/play_rped_sound() //Plays the sound for RPED exhanging or installing parts.