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

Merge pull request #31290 from YPOQ/jaunterfix

Browse Source 
Fixes jaunters chasm-saving feature
This commit is contained in:
Leo
2017-10-05 06:48:42 -05:00
committed by CitadelStationBot
parent 05770366b5
commit ced865f76d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/wormhole_jaunter.dm
+5 -4
View File
@@ -17,7 +17,7 @@
/obj/item/device/wormhole_jaunter/attack_self(mob/user) /obj/item/device/wormhole_jaunter/attack_self(mob/user)
user.visible_message("<span class='notice'>[user.name] activates the [src.name]!</span>") user.visible_message("<span class='notice'>[user.name] activates the [src.name]!</span>")
SSblackbox.add_details("jaunter", "User") // user activated SSblackbox.add_details("jaunter", "User") // user activated
activate(user) activate(user, TRUE)
/obj/item/device/wormhole_jaunter/proc/turf_check(mob/user) /obj/item/device/wormhole_jaunter/proc/turf_check(mob/user)
var/turf/device_turf = get_turf(user) var/turf/device_turf = get_turf(user)
@@ -46,7 +46,7 @@
return destinations return destinations
/obj/item/device/wormhole_jaunter/proc/activate(mob/user) /obj/item/device/wormhole_jaunter/proc/activate(mob/user, adjacent)
if(!turf_check(user)) if(!turf_check(user))
return return
@@ -56,7 +56,8 @@
return return
var/chosen_beacon = pick(L) var/chosen_beacon = pick(L)
var/obj/effect/portal/wormhole/jaunt_tunnel/J = new (get_turf(src), src, 100, null, FALSE, get_turf(chosen_beacon)) var/obj/effect/portal/wormhole/jaunt_tunnel/J = new (get_turf(src), src, 100, null, FALSE, get_turf(chosen_beacon))
try_move_adjacent(J) if(adjacent)
try_move_adjacent(J)
playsound(src,'sound/effects/sparks4.ogg',50,1) playsound(src,'sound/effects/sparks4.ogg',50,1)
qdel(src) qdel(src)
@@ -78,7 +79,7 @@
if(user.get_item_by_slot(slot_belt) == src) if(user.get_item_by_slot(slot_belt) == src)
to_chat(user, "Your [src] activates, saving you from the chasm!</span>") to_chat(user, "Your [src] activates, saving you from the chasm!</span>")
SSblackbox.add_details("jaunter","Chasm") // chasm automatic activation SSblackbox.add_details("jaunter","Chasm") // chasm automatic activation
activate(user) activate(user, FALSE)
else else
to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>") to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")