cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6210 from comma/nochatter

Browse Source 
Sending PDA messages and talking in radio things now triggers autoaim.
This commit is contained in:
Ccomp5950
2014-08-29 22:44:04 -05:00
parent 48f7f08d64 4cc2bd4e3d
commit f6b2fbd32d
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -877,6 +877,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) /obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P)
U.visible_message("<span class='notice'>[U] taps on \his PDA's screen.</span>")
U.last_target_click = world.time
var/t = input(U, "Please enter message", name, null) as text var/t = input(U, "Please enter message", name, null) as text
t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN) t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
if (!t || !istype(P)) if (!t || !istype(P))

1
code/game/objects/items/devices/radio/radio.dm
View File

@@ -229,6 +229,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
if(!(src.wires & WIRE_TRANSMIT)) // The device has to have all its wires and shit intact if(!(src.wires & WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
return return
M.last_target_click = world.time
if(GLOBAL_RADIO_TYPE == 1) // NEW RADIO SYSTEMS: By Doohl if(GLOBAL_RADIO_TYPE == 1) // NEW RADIO SYSTEMS: By Doohl