diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 29fec7bce86..6b9be0282e9 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -10,6 +10,7 @@ var/creator = null anchored = 1.0 var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent + var/can_multitool_to_remove = 0 /obj/effect/portal/Bumped(mob/M as mob|obj) src.teleport(M) @@ -47,4 +48,8 @@ src.icon_state = "portal1" do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0) else - do_teleport(M, target, precision) ///You will appear adjacent to the beacon \ No newline at end of file + do_teleport(M, target, precision) ///You will appear adjacent to the beacon + +/obj/effect/portal/attackby(obj/item/A, mob/user) + if(istype(A, /obj/item/device/multitool) && can_multitool_to_remove) + qdel(src) \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 3c4766fd58b..74e0b3af14e 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -279,13 +279,13 @@ desc = "A projector that emits high density quantum-coupled bluespace beams." ammo_type = list(/obj/item/ammo_casing/energy/wormhole, /obj/item/ammo_casing/energy/wormhole/orange) item_state = null - icon_state = "wormhole_projector100" + icon_state = "wormhole_projector1" var/obj/effect/portal/blue var/obj/effect/portal/orange /obj/item/weapon/gun/energy/wormhole_projector/update_icon() - icon_state = "[initial(icon_state)][select]" + icon_state = "wormhole_projector[select]" item_state = icon_state return @@ -306,6 +306,8 @@ /obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(obj/item/projectile/beam/wormhole/W) var/obj/effect/portal/P = new /obj/effect/portal(get_turf(W), null, src) P.precision = 0 + P.failchance = 0 + P.can_multitool_to_remove = 1 if(W.name == "bluespace beam") qdel(blue) blue = P