cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 13:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click

Browse Source 
Ctrl+Click now removes pens from PDAs
This commit is contained in:
Atermonera
2020-01-15 20:06:40 -08:00
committed by GitHub
parent c4c8f2102f e0774cceef
commit 4b726189cc
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -68,6 +68,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(..(user, 1))
to_chat(user, "The time [stationtime2text()] is displayed in the corner of the screen.")
/obj/item/device/pda/CtrlClick()
if(issilicon(usr))
return
if(can_use(usr))
remove_pen()
return
..()
/obj/item/device/pda/AltClick()
if(issilicon(usr))
@@ -1043,6 +1051,19 @@ var/global/list/obj/item/device/pda/PDAs = list()
id.loc = get_turf(src)
id = null
/obj/item/device/pda/proc/remove_pen()
var/obj/item/weapon/pen/O = locate() in src
if(O)
if(istype(loc, /mob))
var/mob/M = loc
if(M.get_active_hand() == null)
M.put_in_hands(O)
to_chat(usr, "<span class='notice'>You remove \the [O] from \the [src].</span>")
return
O.loc = get_turf(src)
else
to_chat(usr, "<span class='notice'>This PDA does not have a pen in it.</span>")
/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P, var/tap = 1)
if(tap)
U.visible_message("<span class='notice'>\The [U] taps on their PDA's screen.</span>")
@@ -1203,17 +1224,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
return
if ( can_use(usr) )
var/obj/item/weapon/pen/O = locate() in src
if(O)
if (istype(loc, /mob))
var/mob/M = loc
if(M.get_active_hand() == null)
M.put_in_hands(O)
to_chat(usr, "<span class='notice'>You remove \the [O] from \the [src].</span>")
return
O.loc = get_turf(src)
else
to_chat(usr, "<span class='notice'>This PDA does not have a pen in it.</span>")
remove_pen()
else
to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")