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

Merge pull request #3192 from Tastyfish/tcomms-teardown

Browse Source 
Fixes Telecomms machines to be deconstructable
This commit is contained in:
Fox McCloud
2016-01-11 06:40:38 -05:00
parent 67fa27680e 8527933115
commit b5f86bda3c
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/broadcaster.dm
+1 -1
View File
@@ -20,7 +20,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
use_power = 1
idle_power_usage = 25
machinetype = 5
circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster"
circuitboard = /obj/item/weapon/circuitboard/telecomms/broadcaster
/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
// Don't broadcast rejected signals
code/game/machinery/telecomms/machine_interactions.dm
+2 -5
View File
@@ -71,15 +71,12 @@
I.crit_fail = 1
I.loc = src.loc
else
// If the machine wasn't made during runtime, probably doesn't have components:
// manually find the components and drop them!
var/newpath = text2path(circuitboard)
var/obj/item/weapon/circuitboard/C = new newpath
var/obj/item/weapon/circuitboard/C = new circuitboard
for(var/I in C.req_components)
for(var/i = 1, i <= C.req_components[I], i++)
newpath = text2path(I)
var/obj/item/s = new newpath
var/obj/item/s = new I
s.loc = src.loc
if(istype(s, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/A = s
code/game/machinery/telecomms/telecomunications.dm
+7 -7
View File
@@ -29,7 +29,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/toggled = 1 // Is it toggled on
var/on = 1
var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub)
var/circuitboard = null // string pointing to a circuitboard type
var/circuitboard = null // type pointing to a circuitboard type
var/hide = 0 // Is it a hidden machine?
var/listening_level = 0 // 0 = auto set in New() - this is the z level that the machine is listening to.
Mtoollink = 1
@@ -224,7 +224,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 30
machinetype = 1
circuitboard = "/obj/item/weapon/circuitboard/telecomms/receiver"
circuitboard = /obj/item/weapon/circuitboard/telecomms/receiver
/obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal)
@@ -280,7 +280,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 80
machinetype = 7
circuitboard = "/obj/item/weapon/circuitboard/telecomms/hub"
circuitboard = /obj/item/weapon/circuitboard/telecomms/hub
long_range_link = 1
netspeed = 40
@@ -314,7 +314,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 30
machinetype = 8
circuitboard = "/obj/item/weapon/circuitboard/telecomms/relay"
circuitboard = /obj/item/weapon/circuitboard/telecomms/relay
netspeed = 5
long_range_link = 1
var/broadcasting = 1
@@ -365,7 +365,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 50
machinetype = 2
circuitboard = "/obj/item/weapon/circuitboard/telecomms/bus"
circuitboard = /obj/item/weapon/circuitboard/telecomms/bus
netspeed = 40
var/change_frequency = 0
@@ -417,7 +417,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 30
machinetype = 3
circuitboard = "/obj/item/weapon/circuitboard/telecomms/processor"
circuitboard = /obj/item/weapon/circuitboard/telecomms/processor
var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals
receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
@@ -454,7 +454,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 15
machinetype = 4
circuitboard = "/obj/item/weapon/circuitboard/telecomms/server"
circuitboard = /obj/item/weapon/circuitboard/telecomms/server
var/list/log_entries = list()
var/list/stored_names = list()
var/list/TrafficActions = list()