cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nanoui-is-dead

Browse Source
This commit is contained in:
AffectedArc07
2020-11-26 09:34:14 +00:00
committed by GitHub
parent afa8d97288 e859088889
commit 44012814d0
70 changed files with 719 additions and 1906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/marker_beacons.dm
+6 -3
View File
@@ -107,15 +107,18 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
. = ..()
if(.)
return
if(user.incapacitated())
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
if(do_after(user, remove_speed, target = src))
var/obj/item/stack/marker_beacon/M = new(loc)
M.picked_color = picked_color
M.update_icon()
transfer_fingerprints_to(M)
if(user.put_in_hands(M, TRUE)) //delete the beacon if it fails
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
qdel(src) //otherwise delete us
user.put_in_hands(M)
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
qdel(src)
/obj/structure/marker_beacon/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/stack/marker_beacon))