cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Batch 2.

Browse Source
This commit is contained in:
ESwordTheCat
2014-05-25 03:45:41 -08:00
parent 67d7da52c3
commit 84a8b2056d
18 changed files with 144 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -6,7 +6,6 @@
desc = "Has a valve and pump attached to it"
use_power = 1
var/area/initial_loc
level = 1
var/area_uid
var/id_tag = null
@@ -44,17 +43,14 @@
icon_state = "in"
New()
initial_loc = get_area(loc)
if (initial_loc.master)
initial_loc = initial_loc.master
area_uid = initial_loc.uid
..()
area_uid = areaMaster.uid
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
if(ticker && ticker.current_state == 3)//if the game is running
src.initialize()
src.broadcast_status()
..()
high_volume
name = "Large Air Vent"
@@ -168,11 +164,11 @@
"sigtype" = "status"
)
if(!initial_loc.air_vent_names[id_tag])
var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]"
initial_loc.air_vent_names[id_tag] = new_name
src.name = new_name
initial_loc.air_vent_info[id_tag] = signal.data
if(!areaMaster.air_vent_names[id_tag])
var/new_name = "[areaMaster.name] Vent Pump #[areaMaster.air_vent_names.len+1]"
areaMaster.air_vent_names[id_tag] = new_name
name = new_name
areaMaster.air_vent_info[id_tag] = signal.data
radio_connection.post_signal(src, signal, radio_filter_out)
@@ -362,11 +358,9 @@
del(src)
/obj/machinery/atmospherics/unary/vent_pump/Destroy()
if(initial_loc)
initial_loc.air_vent_info -= id_tag
initial_loc.air_vent_names -= id_tag
areaMaster.air_vent_info.Remove(id_tag)
areaMaster.air_vent_names.Remove(id_tag)
..()
return
/obj/machinery/atmospherics/unary/vent_pump/Topic(href, href_list)
if(..())

22
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -8,7 +8,6 @@
level = 1
var/area/initial_loc
var/id_tag = null
var/frequency = 1439
var/datum/radio_frequency/radio_connection
@@ -28,17 +27,14 @@
var/radio_filter_out
var/radio_filter_in
New()
initial_loc = get_area(loc)
if (initial_loc.master)
initial_loc = initial_loc.master
area_uid = initial_loc.uid
..()
area_uid = areaMaster.uid
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
if(ticker && ticker.current_state == 3)//if the game is running
src.initialize()
src.broadcast_status()
..()
update_icon()
var/hidden=""
@@ -84,11 +80,11 @@
"filter_n2" = scrub_N2,
"sigtype" = "status"
)
if(!initial_loc.air_scrub_names[id_tag])
var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]"
initial_loc.air_scrub_names[id_tag] = new_name
if(!areaMaster.air_scrub_names[id_tag])
var/new_name = "[areaMaster.name] Air Scrubber #[areaMaster.air_scrub_names.len+1]"
areaMaster.air_scrub_names[id_tag] = new_name
src.name = new_name
initial_loc.air_scrub_info[id_tag] = signal.data
areaMaster.air_scrub_info[id_tag] = signal.data
radio_connection.post_signal(src, signal, radio_filter_out)
return 1
@@ -348,8 +344,6 @@
update_multitool_menu(usr)
/obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
if(initial_loc)
initial_loc.air_scrub_info -= id_tag
initial_loc.air_scrub_names -= id_tag
areaMaster.air_scrub_info.Remove(id_tag)
areaMaster.air_scrub_names.Remove(id_tag)
..()
return