shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fusion_2

Browse Source
This commit is contained in:
kevinz000
2018-09-03 11:17:45 -07:00
committed by GitHub
parent f8a0ac8574 22e3211f44
commit 0e0928df26
124 changed files with 5852 additions and 3820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -114,11 +114,11 @@
/obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode)
. = ..()
if (message_mode == MODE_INTERCOM)
return // Avoid hearing the same thing twice
if(!anyai && !(speaker in ai))
return
..()
/obj/item/radio/intercom/process()
if(((world.timeofday - last_tick) > 30) || ((world.timeofday - last_tick) < 0))
code/game/objects/items/devices/radio/radio.dm
+1
View File
@@ -276,6 +276,7 @@
signal.broadcast()
/obj/item/radio/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
. = ..()
if(radio_freq || !broadcasting || get_dist(src, speaker) > canhear_range)
return
code/game/objects/items/devices/scanners.dm
+4 -5
View File
@@ -328,7 +328,7 @@ SLIME SCANNER
if(cyberimp_detect)
to_chat(user, "<span class='notice'>Detected cybernetic modifications:</span>")
to_chat(user, "<span class='notice'>[cyberimp_detect]</span>")
//SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, FALSE)
SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, FALSE)
/proc/chemscan(mob/living/user, mob/living/M)
if(istype(M))
@@ -612,7 +612,6 @@ SLIME SCANNER
to_chat(user, "<span_class = 'notice'>Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]</span>")
to_chat(user, "========================")
/obj/item/nanite_scanner
name = "nanite scanner"
icon = 'icons/obj/device.dmi'
@@ -635,6 +634,6 @@ SLIME SCANNER
add_fingerprint(user)
//var/response = SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, TRUE)
//if(!response)
// to_chat(user, "<span class='info'>No nanites detected in the subject.</span>")
var/response = SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, TRUE)
if(!response)
to_chat(user, "<span class='info'>No nanites detected in the subject.</span>")
code/game/objects/items/devices/taperecorder.dm
+1
View File
@@ -95,6 +95,7 @@
/obj/item/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
. = ..()
if(mytape && recording)
mytape.timestamp += mytape.used_capacity
mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [message]"