Merge pull request #3995 from deathride58/manualsyncsreeEEEE
Manual map syncs + manual mirrors of missed upstream map PRs
This commit is contained in:
deathride58
@@ -507,6 +507,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
|
||||
|
||||
var/list/areas_all = list()
|
||||
var/list/areas_with_APC = list()
|
||||
var/list/areas_with_multiple_APCs = list()
|
||||
var/list/areas_with_air_alarm = list()
|
||||
var/list/areas_with_RC = list()
|
||||
var/list/areas_with_light = list()
|
||||
@@ -528,6 +529,8 @@ GLOBAL_PROTECT(LastAdminCalledProc)
|
||||
var/area/A = APC.area
|
||||
if(!(A.type in areas_with_APC))
|
||||
areas_with_APC.Add(A.type)
|
||||
else if(A.type in areas_all)
|
||||
areas_with_multiple_APCs.Add(A.type)
|
||||
|
||||
for(var/obj/machinery/airalarm/AA in GLOB.machines)
|
||||
var/area/A = get_area(AA)
|
||||
@@ -567,33 +570,48 @@ GLOBAL_PROTECT(LastAdminCalledProc)
|
||||
var/list/areas_without_intercom = areas_all - areas_with_intercom
|
||||
var/list/areas_without_camera = areas_all - areas_with_camera
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT AN APC:</b>")
|
||||
for(var/areatype in areas_without_APC)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_without_APC.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT AN APC:</b>")
|
||||
for(var/areatype in areas_without_APC)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT AN AIR ALARM:</b>")
|
||||
for(var/areatype in areas_without_air_alarm)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_with_multiple_APCs.len)
|
||||
to_chat(world, "<b>AREAS WITH MULTIPLE APCS:</b>")
|
||||
for(var/areatype in areas_with_multiple_APCs)
|
||||
to_chat(world,"* [areatype]")
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT A REQUEST CONSOLE:</b>")
|
||||
for(var/areatype in areas_without_RC)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_without_air_alarm.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT AN AIR ALARM:</b>")
|
||||
for(var/areatype in areas_without_air_alarm)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT ANY LIGHTS:</b>")
|
||||
for(var/areatype in areas_without_light)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_without_RC.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT A REQUEST CONSOLE:</b>")
|
||||
for(var/areatype in areas_without_RC)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT A LIGHT SWITCH:</b>")
|
||||
for(var/areatype in areas_without_LS)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_without_light.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT ANY LIGHTS:</b>")
|
||||
for(var/areatype in areas_without_light)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT ANY INTERCOMS:</b>")
|
||||
for(var/areatype in areas_without_intercom)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_without_LS.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT A LIGHT SWITCH:</b>")
|
||||
for(var/areatype in areas_without_LS)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
to_chat(world, "<b>AREAS WITHOUT ANY CAMERAS:</b>")
|
||||
for(var/areatype in areas_without_camera)
|
||||
to_chat(world, "* [areatype]")
|
||||
if(areas_without_intercom.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT ANY INTERCOMS:</b>")
|
||||
for(var/areatype in areas_without_intercom)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
if(areas_without_camera.len)
|
||||
to_chat(world, "<b>AREAS WITHOUT ANY CAMERAS:</b>")
|
||||
for(var/areatype in areas_without_camera)
|
||||
to_chat(world, "* [areatype]")
|
||||
|
||||
if(!(areas_with_APC.len || areas_with_multiple_APCs.len || areas_with_air_alarm.len || areas_with_RC.len || areas_with_light.len || areas_with_LS.len || areas_with_intercom.len || areas_with_camera.len))
|
||||
to_chat(world, "<b>No problem areas!</b>")
|
||||
|
||||
/client/proc/cmd_admin_areatest_station()
|
||||
set category = "Mapping"
|
||||
@@ -782,7 +800,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
|
||||
set category = "Debug"
|
||||
set name = "Display overlay Log"
|
||||
set desc = "Display SSoverlays log of everything that's passed through it."
|
||||
|
||||
|
||||
render_stats(SSoverlays.stats, src)
|
||||
|
||||
/client/proc/cmd_display_init_log()
|
||||
@@ -918,4 +936,3 @@ GLOBAL_PROTECT(LastAdminCalledProc)
|
||||
return
|
||||
sort = sortlist[sort]
|
||||
profile_show(src, sort)
|
||||
|
||||
|
||||
@@ -26,11 +26,6 @@
|
||||
setDir(make_from.dir)
|
||||
anchored = TRUE
|
||||
|
||||
if(istype(make_from, /obj/structure/disposalpipe))
|
||||
var/obj/structure/disposalpipe/D = make_from
|
||||
if(D.construct_type)
|
||||
pipe_type = D.construct_type
|
||||
|
||||
else
|
||||
if(_pipe_type)
|
||||
pipe_type = _pipe_type
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes
|
||||
var/dpdir = NONE // bitmask of pipe directions
|
||||
var/initialize_dirs = NONE // bitflags of pipe directions added on init, see \code\_DEFINES\pipe_construction.dm
|
||||
var/construct_type // If set, used as type for pipe constructs. If not set, src.type is used.
|
||||
var/flip_type // If set, the pipe is flippable and becomes this type when flipped
|
||||
var/obj/structure/disposalconstruct/stored
|
||||
|
||||
@@ -29,14 +28,6 @@
|
||||
else
|
||||
stored = new /obj/structure/disposalconstruct(src, make_from=src)
|
||||
|
||||
// Hack for old map pipes to work, remove after all maps are updated
|
||||
if(flip_type)
|
||||
var/obj/structure/disposalpipe/flip = flip_type
|
||||
if(icon_state == initial(flip.icon_state))
|
||||
initialize_dirs = initial(flip.initialize_dirs)
|
||||
construct_type = flip_type
|
||||
|
||||
|
||||
if(dir in GLOB.diagonals) // Bent pipes already have all the dirs set
|
||||
initialize_dirs = NONE
|
||||
|
||||
@@ -199,28 +190,10 @@
|
||||
deconstruct()
|
||||
|
||||
|
||||
// Straight pipe segment
|
||||
/obj/structure/disposalpipe/segment
|
||||
icon_state = "pipe"
|
||||
initialize_dirs = DISP_DIR_FLIP
|
||||
|
||||
/obj/structure/disposalpipe/segment/Initialize()
|
||||
// Hacks for old map pipes to work, remove after all maps are updated
|
||||
if(icon_state == "pipe-c")
|
||||
switch(dir)
|
||||
if(NORTH)
|
||||
dir = NORTHEAST
|
||||
if(SOUTH)
|
||||
dir = SOUTHWEST
|
||||
if(EAST)
|
||||
dir = SOUTHEAST
|
||||
if(WEST)
|
||||
dir = NORTHWEST
|
||||
|
||||
if(icon_state != "pipe")
|
||||
icon_state = "pipe"
|
||||
. = ..()
|
||||
|
||||
|
||||
// A three-way junction with dir being the dominant direction
|
||||
/obj/structure/disposalpipe/junction
|
||||
@@ -228,14 +201,6 @@
|
||||
initialize_dirs = DISP_DIR_RIGHT | DISP_DIR_FLIP
|
||||
flip_type = /obj/structure/disposalpipe/junction/flip
|
||||
|
||||
/obj/structure/disposalpipe/junction/Initialize()
|
||||
if(icon_state == "pipe-y") // Hack for old map pipes to work, remove after all maps are updated
|
||||
initialize_dirs = DISP_DIR_LEFT | DISP_DIR_RIGHT
|
||||
flip_type = null
|
||||
construct_type = /obj/structure/disposalpipe/junction/yjunction
|
||||
. = ..()
|
||||
|
||||
|
||||
// next direction to move
|
||||
// if coming in from secondary dirs, then next is primary dir
|
||||
// if coming in from primary dir, then next is equal chance of other dirs
|
||||
|
||||
@@ -92,11 +92,3 @@
|
||||
icon_state = "pipe-j2s"
|
||||
flip_type = /obj/structure/disposalpipe/sorting/wrap
|
||||
initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP
|
||||
|
||||
|
||||
// Hacks for old map pipes to work, remove after all maps are updated
|
||||
/obj/structure/disposalpipe/wrapsortjunction
|
||||
parent_type = /obj/structure/disposalpipe/sorting/wrap
|
||||
|
||||
/obj/structure/disposalpipe/sortjunction
|
||||
parent_type = /obj/structure/disposalpipe/sorting/mail
|
||||
|
||||
Reference in New Issue
Block a user