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

Removed areaMaster (#18459)

Browse Source
This commit is contained in:
DamianX
2018-06-13 14:28:33 +02:00
committed by jknpj
parent db1785e177
commit 49df48fabc
45 changed files with 302 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,8 @@
/obj/machinery/atmospherics/unary/vent_pump/New()
..()
area_uid = areaMaster.uid
var/area/here = get_area(src)
area_uid = here.uid
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
@@ -160,8 +161,9 @@
radio_connection = radio_controller.add_object(src, frequency,radio_filter_in)
if(frequency != 1439)
areaMaster.air_vent_info -= id_tag
areaMaster.air_vent_names -= id_tag
var/area/this_area = get_area(src)
this_area.air_vent_info -= id_tag
this_area.air_vent_names -= id_tag
name = "Vent Pump"
else
broadcast_status()
@@ -193,11 +195,12 @@
)
if(frequency == 1439)
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
var/area/this_area = get_area(src)
if(!this_area.air_vent_names[id_tag])
var/new_name = "[this_area.name] Vent Pump #[this_area.air_vent_names.len+1]"
this_area.air_vent_names[id_tag] = new_name
name = new_name
areaMaster.air_vent_info[id_tag] = signal.data
this_area.air_vent_info[id_tag] = signal.data
radio_connection.post_signal(src, signal, radio_filter_out)
@@ -344,8 +347,9 @@
return ..()
/obj/machinery/atmospherics/unary/vent_pump/Destroy()
areaMaster.air_vent_info.Remove(id_tag)
areaMaster.air_vent_names.Remove(id_tag)
var/area/this_area = get_area(src)
this_area.air_vent_info.Remove(id_tag)
this_area.air_vent_names.Remove(id_tag)
..()
/obj/machinery/atmospherics/unary/vent_pump/multitool_topic(var/mob/user, var/list/href_list, var/obj/O)
@@ -354,8 +358,9 @@
if(!newid)
return
if(frequency == 1439)
areaMaster.air_vent_info -= id_tag
areaMaster.air_vent_names -= id_tag
var/area/this_area = get_area(src)
this_area.air_vent_info -= id_tag
this_area.air_vent_names -= id_tag
id_tag = newid
broadcast_status()
@@ -365,10 +370,11 @@
return ..()
/obj/machinery/atmospherics/unary/vent_pump/change_area(var/area/oldarea, var/area/newarea)
areaMaster.air_vent_info.Remove(id_tag)
areaMaster.air_vent_names.Remove(id_tag)
var/area/this_area = get_area(src)
this_area.air_vent_info.Remove(id_tag)
this_area.air_vent_names.Remove(id_tag)
..()
area_uid = areaMaster.uid
area_uid = this_area.uid
broadcast_status()
/obj/machinery/atmospherics/unary/vent_pump/canClone(var/obj/O)
@@ -376,8 +382,9 @@
/obj/machinery/atmospherics/unary/vent_pump/clone(var/obj/machinery/atmospherics/unary/vent_pump/O)
if(frequency == 1439) // Note: if the frequency stays at 1439 we'll be readded to the area in set_frequency().
areaMaster.air_vent_info -= id_tag
areaMaster.air_vent_names -= id_tag
var/area/this_area = get_area(src)
this_area.air_vent_info -= id_tag
this_area.air_vent_names -= id_tag
id_tag = O.id_tag
set_frequency(O.frequency)

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

@@ -45,7 +45,8 @@
/obj/machinery/atmospherics/unary/vent_scrubber/New()
..()
area_uid = areaMaster.uid
var/area/this_area = get_area(src)
area_uid = this_area.uid
if (!id_tag)
assign_uid()
id_tag = num2text(uid)
@@ -81,8 +82,9 @@
radio_connection = radio_controller.add_object(src, frequency, radio_filter_in)
if(frequency != 1439)
areaMaster.air_scrub_info -= id_tag
areaMaster.air_scrub_names -= id_tag
var/area/this_area = get_area(src)
this_area.air_scrub_info -= id_tag
this_area.air_scrub_names -= id_tag
name = "Air Scrubber"
else
broadcast_status()
@@ -115,11 +117,12 @@
"sigtype" = "status"
)
if(frequency == 1439)
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
var/area/this_area = get_area(src)
if(!this_area.air_scrub_names[id_tag])
var/new_name = "[this_area.name] Air Scrubber #[this_area.air_scrub_names.len+1]"
this_area.air_scrub_names[id_tag] = new_name
src.name = new_name
areaMaster.air_scrub_info[id_tag] = signal.data
this_area.air_scrub_info[id_tag] = signal.data
radio_connection.post_signal(src, signal, radio_filter_out)
@@ -349,8 +352,9 @@
"}
/obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
areaMaster.air_scrub_info.Remove(id_tag)
areaMaster.air_scrub_names.Remove(id_tag)
var/area/this_area = get_area(src)
this_area.air_scrub_info.Remove(id_tag)
this_area.air_scrub_names.Remove(id_tag)
..()
/obj/machinery/atmospherics/unary/vent_scrubber/multitool_topic(var/mob/user, var/list/href_list, var/obj/O)
@@ -360,8 +364,9 @@
return
if(frequency == 1439)
areaMaster.air_scrub_info -= id_tag
areaMaster.air_scrub_names -= id_tag
var/area/this_area = get_area(src)
this_area.air_scrub_info -= id_tag
this_area.air_scrub_names -= id_tag
id_tag = newid
broadcast_status()
@@ -371,10 +376,10 @@
return ..()
/obj/machinery/atmospherics/unary/vent_scrubber/change_area(var/area/oldarea, var/area/newarea)
areaMaster.air_scrub_info.Remove(id_tag)
areaMaster.air_scrub_names.Remove(id_tag)
oldarea.air_scrub_info.Remove(id_tag)
oldarea.air_scrub_names.Remove(id_tag)
..()
area_uid = areaMaster.uid
area_uid = newarea.uid
broadcast_status()
/obj/machinery/atmospherics/unary/vent_scrubber/canClone(var/obj/O)
@@ -382,8 +387,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/clone(var/obj/machinery/atmospherics/unary/vent_scrubber/O)
if(frequency == 1439) // Note: if the frequency stays at 1439 we'll be readded to the area in set_frequency().
areaMaster.air_scrub_info -= id_tag
areaMaster.air_scrub_names -= id_tag
var/area/this_area = get_area(src)
this_area.air_scrub_info -= id_tag
this_area.air_scrub_names -= id_tag
id_tag = O.id_tag
set_frequency(O.frequency)

2
code/ATMOSPHERICS/pipes.dm
View File

@@ -251,7 +251,7 @@
var/turf/T=get_turf(src)
message_admins("Pipe burst in area [formatJumpTo(T)]")
var/area/A=get_area_master(src)
var/area/A=get_area(src)
log_game("Pipe burst in area [A.name] ")
// Disconnect first.