cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update mapping_helpers.dm

Browse Source
This commit is contained in:
Novacat
2020-04-11 23:49:58 -04:00
committed by GitHub
parent 92792fd0dc
commit 57a78c5e72
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/machinery/embedded_controller/mapping_helpers.dm
View File

@@ -145,10 +145,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13
/obj/effect/map_helper/airlock/sensor/setup() /obj/effect/map_helper/airlock/sensor/setup()
var/obj/machinery/airlock_sensor/my_sensor = my_device var/obj/machinery/airlock_sensor/my_sensor = my_device
my_sensor.id_tag = my_controller.id_tag + tag_addon my_sensor.id_tag = my_controller.id_tag + tag_addon
<<<<<<< HEAD
=======
my_sensor.master_tag = my_controller.id_tag my_sensor.master_tag = my_controller.id_tag
>>>>>>> 98fe590... Merge pull request #6937 from VOREStation/pol-dockhelpers
my_sensor.frequency = my_controller.frequency my_sensor.frequency = my_controller.frequency
my_sensor.set_frequency(my_controller.frequency) my_sensor.set_frequency(my_controller.frequency)
if(command) if(command)