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

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

@@ -1,194 +1,194 @@
/obj/item/device/assembly/signaler /obj/item/device/assembly/signaler
name = "remote signaling device" name = "remote signaling device"
desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration." desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration."
icon_state = "signaller" icon_state = "signaller"
item_state = "signaler" item_state = "signaler"
origin_tech = list(TECH_MAGNET = 1) origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 200, "waste" = 100) matter = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 200, "waste" = 100)
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
secured = TRUE secured = TRUE
var/code = 30 var/code = 30
var/frequency = 1457 var/frequency = 1457
var/delay = 0 var/delay = 0
var/airlock_wire = null var/airlock_wire = null
var/datum/wires/connected = null var/datum/wires/connected = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
var/deadman = FALSE var/deadman = FALSE
/obj/item/device/assembly/signaler/New() /obj/item/device/assembly/signaler/New()
..() ..()
spawn(40) spawn(40)
set_frequency(frequency) set_frequency(frequency)
return return
/obj/item/device/assembly/signaler/activate() /obj/item/device/assembly/signaler/activate()
if(cooldown > 0) return FALSE if(cooldown > 0) return FALSE
cooldown = 2 cooldown = 2
spawn(10) spawn(10)
process_cooldown() process_cooldown()
signal() signal()
return TRUE return TRUE
/obj/item/device/assembly/signaler/update_icon() /obj/item/device/assembly/signaler/update_icon()
if(holder) if(holder)
holder.update_icon() holder.update_icon()
return return
/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1) /obj/item/device/assembly/signaler/interact(mob/user as mob, flag1)
var/t1 = "-------" var/t1 = "-------"
// if ((src.b_stat && !( flag1 ))) // if ((src.b_stat && !( flag1 )))
// t1 = text("-------<BR>\nGreen Wire: []<BR>\nRed Wire: []<BR>\nBlue Wire: []<BR>\n", (src.wires & 4 ? text("<A href='?src=\ref[];wires=4'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=4'>Mend Wire</A>", src)), (src.wires & 2 ? text("<A href='?src=\ref[];wires=2'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=2'>Mend Wire</A>", src)), (src.wires & 1 ? text("<A href='?src=\ref[];wires=1'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=1'>Mend Wire</A>", src))) // t1 = text("-------<BR>\nGreen Wire: []<BR>\nRed Wire: []<BR>\nBlue Wire: []<BR>\n", (src.wires & 4 ? text("<A href='?src=\ref[];wires=4'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=4'>Mend Wire</A>", src)), (src.wires & 2 ? text("<A href='?src=\ref[];wires=2'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=2'>Mend Wire</A>", src)), (src.wires & 1 ? text("<A href='?src=\ref[];wires=1'>Cut Wire</A>", src) : text("<A href='?src=\ref[];wires=1'>Mend Wire</A>", src)))
// else // else
// t1 = "-------" Speaker: [src.listening ? "<A href='byond://?src=\ref[src];listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];listen=1'>Disengaged</A>"]<BR> // t1 = "-------" Speaker: [src.listening ? "<A href='byond://?src=\ref[src];listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];listen=1'>Disengaged</A>"]<BR>
var/dat = {" var/dat = {"
<TT> <TT>
<A href='byond://?src=\ref[src];send=1'>Send Signal</A><BR> <A href='byond://?src=\ref[src];send=1'>Send Signal</A><BR>
<B>Frequency/Code</B> for signaler:<BR> <B>Frequency/Code</B> for signaler:<BR>
Frequency: Frequency:
<A href='byond://?src=\ref[src];freq=-10'>-</A> <A href='byond://?src=\ref[src];freq=-10'>-</A>
<A href='byond://?src=\ref[src];freq=-2'>-</A> <A href='byond://?src=\ref[src];freq=-2'>-</A>
[format_frequency(src.frequency)] [format_frequency(src.frequency)]
<A href='byond://?src=\ref[src];freq=2'>+</A> <A href='byond://?src=\ref[src];freq=2'>+</A>
<A href='byond://?src=\ref[src];freq=10'>+</A><BR> <A href='byond://?src=\ref[src];freq=10'>+</A><BR>
Code: Code:
<A href='byond://?src=\ref[src];code=-5'>-</A> <A href='byond://?src=\ref[src];code=-5'>-</A>
<A href='byond://?src=\ref[src];code=-1'>-</A> <A href='byond://?src=\ref[src];code=-1'>-</A>
[src.code] [src.code]
<A href='byond://?src=\ref[src];code=1'>+</A> <A href='byond://?src=\ref[src];code=1'>+</A>
<A href='byond://?src=\ref[src];code=5'>+</A><BR> <A href='byond://?src=\ref[src];code=5'>+</A><BR>
[t1] [t1]
</TT>"} </TT>"}
user << browse(dat, "window=radio") user << browse(dat, "window=radio")
onclose(user, "radio") onclose(user, "radio")
return return
/obj/item/device/assembly/signaler/Topic(href, href_list, state = deep_inventory_state) /obj/item/device/assembly/signaler/Topic(href, href_list, state = deep_inventory_state)
if(..()) if(..())
return TRUE return TRUE
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=radio") usr << browse(null, "window=radio")
onclose(usr, "radio") onclose(usr, "radio")
return return
if (href_list["freq"]) if (href_list["freq"])
var/new_frequency = (frequency + text2num(href_list["freq"])) var/new_frequency = (frequency + text2num(href_list["freq"]))
if(new_frequency < RADIO_LOW_FREQ || new_frequency > RADIO_HIGH_FREQ) if(new_frequency < RADIO_LOW_FREQ || new_frequency > RADIO_HIGH_FREQ)
new_frequency = sanitize_frequency(new_frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) new_frequency = sanitize_frequency(new_frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
set_frequency(new_frequency) set_frequency(new_frequency)
if(href_list["code"]) if(href_list["code"])
src.code += text2num(href_list["code"]) src.code += text2num(href_list["code"])
src.code = round(src.code) src.code = round(src.code)
src.code = min(100, src.code) src.code = min(100, src.code)
src.code = max(1, src.code) src.code = max(1, src.code)
if(href_list["send"]) if(href_list["send"])
spawn( 0 ) spawn( 0 )
signal() signal()
if(usr) if(usr)
attack_self(usr) attack_self(usr)
return return
/obj/item/device/assembly/signaler/attackby(obj/item/weapon/W, mob/user, params) /obj/item/device/assembly/signaler/attackby(obj/item/weapon/W, mob/user, params)
if(issignaler(W)) if(issignaler(W))
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
..() ..()
/obj/item/device/assembly/signaler/proc/signal() /obj/item/device/assembly/signaler/proc/signal()
if(!radio_connection) if(!radio_connection)
return return
if(is_jammed(src)) if(is_jammed(src))
return return
var/datum/signal/signal = new var/datum/signal/signal = new
signal.source = src signal.source = src
signal.encryption = code signal.encryption = code
signal.data["message"] = "ACTIVATE" signal.data["message"] = "ACTIVATE"
radio_connection.post_signal(src, signal) radio_connection.post_signal(src, signal)
return return
/obj/item/device/assembly/signaler/pulse(var/radio = 0) /obj/item/device/assembly/signaler/pulse(var/radio = 0)
if(is_jammed(src)) if(is_jammed(src))
return FALSE return FALSE
if(src.connected && src.wires) if(src.connected && src.wires)
connected.Pulse(src) connected.Pulse(src)
else if(holder) else if(holder)
holder.process_activation(src, 1, 0) holder.process_activation(src, 1, 0)
else else
..(radio) ..(radio)
return TRUE return TRUE
/obj/item/device/assembly/signaler/receive_signal(datum/signal/signal) /obj/item/device/assembly/signaler/receive_signal(datum/signal/signal)
if(!signal) if(!signal)
return FALSE return FALSE
if(signal.encryption != code) if(signal.encryption != code)
return FALSE return FALSE
if(!(src.wires & WIRE_RADIO_RECEIVE)) if(!(src.wires & WIRE_RADIO_RECEIVE))
return FALSE return FALSE
if(is_jammed(src)) if(is_jammed(src))
return FALSE return FALSE
pulse(1) pulse(1)
if(!holder) if(!holder)
for(var/mob/O in hearers(1, src.loc)) for(var/mob/O in hearers(1, src.loc))
O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
return return
/obj/item/device/assembly/signaler/proc/set_frequency(new_frequency) /obj/item/device/assembly/signaler/proc/set_frequency(new_frequency)
if(!frequency) if(!frequency)
return return
if(!radio_controller) if(!radio_controller)
sleep(20) sleep(20)
if(!radio_controller) if(!radio_controller)
return return
radio_controller.remove_object(src, frequency) radio_controller.remove_object(src, frequency)
frequency = new_frequency frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT) radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
return return
/obj/item/device/assembly/signaler/process() /obj/item/device/assembly/signaler/process()
if(!deadman) if(!deadman)
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
var/mob/M = src.loc var/mob/M = src.loc
if(!M || !ismob(M)) if(!M || !ismob(M))
if(prob(5)) if(prob(5))
signal() signal()
deadman = FALSE deadman = FALSE
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
else if(prob(5)) else if(prob(5))
M.visible_message("[M]'s finger twitches a bit over [src]'s signal button!") M.visible_message("[M]'s finger twitches a bit over [src]'s signal button!")
return return
/obj/item/device/assembly/signaler/verb/deadman_it() /obj/item/device/assembly/signaler/verb/deadman_it()
set src in usr set src in usr
set name = "Threaten to push the button!" set name = "Threaten to push the button!"
set desc = "BOOOOM!" set desc = "BOOOOM!"
deadman = TRUE deadman = TRUE
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)
log_and_message_admins("is threatening to trigger a signaler deadman's switch") log_and_message_admins("is threatening to trigger a signaler deadman's switch")
usr.visible_message("<font color='red'>[usr] moves their finger over [src]'s signal button...</font>") usr.visible_message("<font color='red'>[usr] moves their finger over [src]'s signal button...</font>")
/obj/item/device/assembly/signaler/Destroy() /obj/item/device/assembly/signaler/Destroy()
if(radio_controller) if(radio_controller)
radio_controller.remove_object(src,frequency) radio_controller.remove_object(src,frequency)
frequency = 0 frequency = 0
. = ..() . = ..()

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"