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

Merge pull request #1869 from Markolie/fuckingglass

Browse Source 
Ghost interaction update, voice changer fix, man up global confirmation
This commit is contained in:
Fox-McCloud
2015-08-28 14:36:16 -04:00
parent dd21928a66 3d970aba1f
commit 8034b35881
15 changed files with 327 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/intercom.dm
+6 -2
View File
@@ -37,12 +37,16 @@
/obj/item/device/radio/intercom/attack_ai(mob/user as mob)
add_hiddenprint(user)
add_fingerprint(user)
spawn (0)
spawn(0)
attack_self(user)
/obj/item/device/radio/intercom/attack_ghost(mob/user as mob)
spawn(0)
attack_self(user)
/obj/item/device/radio/intercom/attack_hand(mob/user as mob)
add_fingerprint(user)
spawn (0)
spawn(0)
attack_self(user)
/obj/item/device/radio/intercom/receive_range(freq, level)
code/game/objects/items/devices/radio/radio.dm
+2 -7
View File
@@ -122,14 +122,9 @@
listening = !listening && !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
/obj/item/device/radio/Topic(href, href_list)
//..()
if (usr.stat || !on)
return
if(..())
return 1
if (!(issilicon(usr) || (usr.contents.Find(src) || ( in_range(src, usr) && istype(loc, /turf) ))))
usr << browse(null, "window=radio")
return
usr.set_machine(src)
if (href_list["track"])
var/mob/target = locate(href_list["track"])
var/mob/living/silicon/ai/A = locate(href_list["track2"])