diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index 5fc6c38689a..be89b0db428 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -30,6 +30,9 @@ var/whatdpipe = PIPE_DISPOSALS_STRAIGHT //What kind of disposals pipe is it? var/spawndelay = RPD_COOLDOWN_TIME var/walldelay = RPD_WALLBUILD_TIME + var/ranged = FALSE + var/primary_sound = 'sound/machines/click.ogg' + var/alt_sound = null /obj/item/rpd/New() ..() @@ -41,11 +44,24 @@ QDEL_NULL(spark_system) return ..() +/obj/item/rpd/bluespace + name = "bluespace rapid pipe dispenser" + desc = "This device can rapidly dispense atmospherics and disposals piping, manipulate loose piping, and recycle any detached pipes it is applied to, at any range." + icon_state = "brpd" + materials = list(MAT_METAL = 75000, MAT_GLASS = 37500, MAT_SILVER = 3000) + origin_tech = "engineering=4;materials=2;bluespace=3" + ranged = TRUE + primary_sound = 'sound/items/PSHOOM.ogg' + alt_sound = 'sound/items/PSHOOM_2.ogg' + //Procs /obj/item/rpd/proc/activate_rpd(delay) //Maybe makes sparks and activates cooldown if there is a delay - playsound(loc, "sound/machines/click.ogg", 50, 1) - if(prob(15)) + if(alt_sound && prob(3)) + playsound(src, alt_sound, 50, 1) + else + playsound(src, primary_sound, 50, 1) + if(prob(15) && !ranged) spark_system.start() if(delay) lastused = world.time @@ -188,7 +204,7 @@ var/list/pipemenu = list( ..() if(loc != user) return - if(!proximity) + if(!proximity && !ranged) return if(world.time < lastused + spawndelay) return @@ -201,6 +217,8 @@ var/list/pipemenu = list( if(target.rpd_act(user, src) == TRUE) // If the object we are clicking on has a valid RPD interaction for just that specific object, do that and nothing else. // Example: clicking on a pipe with a RPD in rotate mode should rotate that pipe and ignore everything else on the tile. + if(ranged) + user.Beam(target, icon_state="rped_upgrade", icon='icons/effects/effects.dmi', time=5) return // If we get this far, we have to check every object in the tile, to make sure that none of them block RPD usage on this tile. @@ -212,6 +230,8 @@ var/list/pipemenu = list( return // If we get here, then we're effectively acting on the turf, probably placing a pipe. + if(ranged) //woosh beam if bluespaced at a distance + user.Beam(T,icon_state="rped_upgrade", icon='icons/effects/effects.dmi', time=5) T.rpd_act(user, src) #undef RPD_COOLDOWN_TIME diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 6008b093c5a..8d0b66fea3b 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -170,12 +170,13 @@ /turf/simulated/wall/rpd_act(mob/user, obj/item/rpd/our_rpd) if(our_rpd.mode == RPD_ATMOS_MODE) - playsound(src, "sound/weapons/circsawhit.ogg", 50, 1) - user.visible_message("[user] starts drilling a hole in [src]...", "You start drilling a hole in [src]...", "You hear drilling.") - if(!do_after(user, our_rpd.walldelay, target = src)) //Drilling into walls takes time - return + if(!our_rpd.ranged) + playsound(src, "sound/weapons/circsawhit.ogg", 50, 1) + user.visible_message("[user] starts drilling a hole in [src]...", "You start drilling a hole in [src]...", "You hear drilling.") + if(!do_after(user, our_rpd.walldelay, target = src)) //Drilling into walls takes time + return our_rpd.create_atmos_pipe(user, src) - else if(our_rpd.mode == RPD_DISPOSALS_MODE) + else if(our_rpd.mode == RPD_DISPOSALS_MODE && !our_rpd.ranged) return else ..() diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 3d7ae0a4fb4..0f6ff11258b 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index a7ac19a5a6c..94609f65f00 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 1111dfb02ee..7ff4d229863 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ