cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5062 from VOREStation/upstream-merge-6089

Browse Source 
[MIRROR] Fixes some signaler bugs
This commit is contained in:
Novacat
2019-04-15 18:47:40 -04:00
committed by GitHub
parent b597e89447 db882f5cfa
commit beadac0ee3
2 changed files with 197 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/assembly/signaler.dm
View File

@@ -104,7 +104,7 @@ Code:
var/obj/item/device/assembly/signaler/signaler2 = W var/obj/item/device/assembly/signaler/signaler2 = W
if(secured && signaler2.secured) if(secured && signaler2.secured)
code = signaler2.code code = signaler2.code
frequency = signaler2.frequency set_frequency(signaler2.frequency)
to_chat(user, "You transfer the frequency and code of [signaler2] to [src].") to_chat(user, "You transfer the frequency and code of [signaler2] to [src].")
else else
..() ..()

5
code/modules/integrated_electronics/subtypes/input.dm
View File

@@ -413,8 +413,9 @@
activate_pin(3) activate_pin(3)
for(var/mob/O in hearers(1, get_turf(src))) if(loc)
O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) for(var/mob/O in hearers(1, get_turf(src)))
O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
/obj/item/integrated_circuit/input/EPv2 /obj/item/integrated_circuit/input/EPv2
name = "\improper EPv2 circuit" name = "\improper EPv2 circuit"