cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes two minor PDA cart issues.

Browse Source
This commit is contained in:
Cyantime
2018-02-27 22:45:09 -05:00
parent 33766df3d4
commit ec5f2543d7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1247,20 +1247,17 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(issilicon(usr)) if(issilicon(usr))
return return
if (can_use(usr) && !isnull(cartridge)) if(can_use(usr) && !isnull(cartridge))
var/turf/T = get_turf(src) cartridge.forceMove(get_turf(src))
cartridge.loc = T if(ismob(loc))
if (ismob(loc))
var/mob/M = loc var/mob/M = loc
M.put_in_hands(cartridge) M.put_in_hands(cartridge)
else
cartridge.loc = get_turf(src)
mode = 0 mode = 0
scanmode = 0 scanmode = 0
if (cartridge.radio) if (cartridge.radio)
cartridge.radio.hostpda = null cartridge.radio.hostpda = null
cartridge = null
to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>") to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
cartridge = null
else else
to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>") to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")

2
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -265,8 +265,6 @@ var/list/civilian_cartridges = list(
if(loc) if(loc)
var/obj/item/PDA = loc var/obj/item/PDA = loc
var/mob/user = PDA.fingerprintslast var/mob/user = PDA.fingerprintslast
if(istype(PDA.loc,/mob/living))
name = PDA.loc
log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")