shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733

Browse Source 
[MIRROR] [s] Cameranet fixes
This commit is contained in:
deathride58
2018-02-23 13:21:23 +00:00
committed by GitHub
parent 15b3716f07 952df00550
commit 21179c9105
23 changed files with 848 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+2 -2
View File
@@ -1900,7 +1900,7 @@
/obj/machinery/computer/security/telescreen{
dir = 1;
name = "Bunker Entrance";
network = list("Bunker1");
network = list("bunker1");
pixel_y = 2
},
/turf/open/floor/plasteel/floorgrime,
@@ -2413,7 +2413,7 @@
/area/ruin/space/has_grav/deepstorage)
"fU" = (
/obj/machinery/camera{
network = list("Bunker1")
network = list("bunker1")
},
/obj/structure/sign/warning/securearea{
pixel_y = 32
_maps/RandomZLevels/moonoutpost19.dmm
+14 -14
View File
@@ -2068,7 +2068,7 @@
},
/obj/machinery/camera{
c_tag = "Xenobiology Containment North";
network = list("MO19X")
network = list("mo19x")
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -2133,7 +2133,7 @@
desc = "Used for watching the contents of the xenobiology containment pen.";
dir = 8;
name = "xenobiology monitor";
network = list("MO19X")
network = list("mo19x")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -2209,7 +2209,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology";
dir = 4;
network = list("MO19","MO19R")
network = list("mo19","mo19r")
},
/turf/open/floor/plasteel/white/side{
dir = 6;
@@ -2750,7 +2750,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology Containment East";
dir = 8;
network = list("MO19X")
network = list("mo19x")
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -3326,7 +3326,7 @@
/obj/machinery/computer/security{
desc = "Used to access the various cameras on the outpost.";
dir = 4;
network = list("MO19R","MO19")
network = list("mo19r","mo19")
},
/turf/open/floor/plasteel/red/side{
dir = 8;
@@ -3461,7 +3461,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology Containment South";
dir = 1;
network = list("MO19X")
network = list("mo19x")
},
/turf/open/floor/engine,
/area/awaymission/moonoutpost19/research)
@@ -3759,7 +3759,7 @@
/obj/machinery/camera{
c_tag = "Research Division";
dir = 1;
network = list("MO19","MO19R")
network = list("mo19","mo19r")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 8;
@@ -3956,7 +3956,7 @@
/obj/machinery/computer/security/telescreen{
desc = "Used for monitoring the research division and the labs within.";
name = "research monitor";
network = list("MO19X","MO19R")
network = list("mo19x","mo19r")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -4306,7 +4306,7 @@
/obj/machinery/camera{
c_tag = "Research Director's Office";
dir = 1;
network = list("MO19","MO19R")
network = list("mo19","mo19r")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -5163,7 +5163,7 @@
/obj/machinery/camera{
c_tag = "Arrivals North";
dir = 1;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel/arrival{
dir = 2;
@@ -5447,7 +5447,7 @@
/obj/machinery/camera{
c_tag = "Kitchen";
dir = 8;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -5593,7 +5593,7 @@
/obj/machinery/camera{
c_tag = "Bar";
dir = 8;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel/bar{
heat_capacity = 1e+006
@@ -6136,7 +6136,7 @@
/obj/machinery/camera{
c_tag = "Arrivals South";
dir = 8;
network = list("MO19")
network = list("mo19")
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -6379,7 +6379,7 @@
/obj/machinery/camera{
c_tag = "Dormitories";
dir = 4;
network = list("MO19")
network = list("mo19")
},
/turf/open/floor/plasteel{
initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
_maps/RandomZLevels/undergroundoutpost45.dmm
+21 -21
View File
@@ -552,7 +552,7 @@
/obj/machinery/camera{
c_tag = "Arrivals";
dir = 8;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/neutral/side{
dir = 4;
@@ -2216,7 +2216,7 @@
"eY" = (
/obj/machinery/computer/security{
dir = 1;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/red/side{
dir = 6;
@@ -2280,7 +2280,7 @@
/obj/machinery/camera{
c_tag = "Hydroponics";
dir = 1;
network = list("UO45")
network = list("uo45")
},
/obj/machinery/power/apc/highcap/fifteen_k{
dir = 2;
@@ -2667,7 +2667,7 @@
/obj/machinery/camera{
c_tag = "Central Hallway";
dir = 1;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -3113,7 +3113,7 @@
/obj/machinery/camera{
c_tag = "Research Lab";
dir = 2;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
@@ -3299,7 +3299,7 @@
/obj/machinery/camera{
c_tag = "Kitchen";
dir = 8;
network = list("UO45")
network = list("uo45")
},
/obj/structure/table,
/obj/machinery/microwave{
@@ -4178,7 +4178,7 @@
/obj/machinery/camera{
c_tag = "Gateway Chamber";
dir = 4;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -4348,7 +4348,7 @@
/obj/machinery/camera{
c_tag = "Bar";
dir = 8;
network = list("UO45")
network = list("uo45")
},
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/bar{
@@ -5363,7 +5363,7 @@
/obj/machinery/camera{
c_tag = "Gateway Ready Room";
dir = 2;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -5480,7 +5480,7 @@
/obj/machinery/camera{
c_tag = "Research Division West";
dir = 1;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 2;
@@ -5662,7 +5662,7 @@
/obj/machinery/camera{
c_tag = "Research Division East";
dir = 1;
network = list("UO45","UO45R")
network = list("uo45","uo45r")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 2;
@@ -5784,7 +5784,7 @@
/obj/machinery/camera{
c_tag = "Engineering Secure Storage";
dir = 2;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plating{
heat_capacity = 1e+006
@@ -6466,7 +6466,7 @@
"no" = (
/obj/machinery/computer/security{
dir = 4;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/red/side{
dir = 8;
@@ -6487,7 +6487,7 @@
desc = "Used for monitoring the research division and the labs within.";
dir = 8;
name = "research monitor";
network = list("UO45R")
network = list("uo45r")
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/red/side{
@@ -6801,7 +6801,7 @@
desc = "Used for monitoring the research division and the labs within.";
dir = 2;
name = "research monitor";
network = list("UO45R")
network = list("uo45r")
},
/turf/open/floor/plasteel/cafeteria{
dir = 5;
@@ -6968,7 +6968,7 @@
/obj/machinery/camera{
c_tag = "Dormitories";
dir = 2;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/neutral/corner{
dir = 1;
@@ -8452,7 +8452,7 @@
/obj/machinery/camera{
c_tag = "Atmospherics";
dir = 2;
network = list("UO45")
network = list("uo45")
},
/obj/structure/table,
/obj/item/clothing/gloves/color/yellow,
@@ -9086,7 +9086,7 @@
/obj/machinery/camera{
c_tag = "Engineering Hallway";
dir = 4;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
@@ -10114,7 +10114,7 @@
"tz" = (
/obj/machinery/computer/security{
dir = 1;
network = list("UO45")
network = list("uo45")
},
/obj/machinery/button/door{
desc = "A remote control-switch for the security privacy shutters.";
@@ -11389,7 +11389,7 @@
/obj/machinery/camera{
c_tag = "Engineering Foyer";
dir = 1;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/floorgrime{
dir = 8;
@@ -12258,7 +12258,7 @@
/obj/machinery/camera{
c_tag = "Mining";
dir = 4;
network = list("UO45")
network = list("uo45")
},
/turf/open/floor/plasteel/floorgrime{
heat_capacity = 1e+006
_maps/map_files/BoxStation/BoxStation.dmm
+138 -212
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+83 -86
View File
@@ -3966,7 +3966,7 @@
/obj/machinery/camera{
c_tag = "Supermatter Engine - Fore";
name = "atmospherics camera";
network = list("SS13","Engine")
network = list("ss13","engine")
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -8666,7 +8666,7 @@
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine")
network = list("engine")
},
/turf/open/floor/engine,
/area/engine/supermatter)
@@ -9245,7 +9245,7 @@
c_tag = "Supermatter Engine - Starboard";
dir = 8;
name = "atmospherics camera";
network = list("SS13","Engine")
network = list("ss13","engine")
},
/obj/structure/cable{
icon_state = "1-2"
@@ -9646,7 +9646,7 @@
c_tag = "Supermatter Engine - Port";
dir = 4;
name = "atmospherics camera";
network = list("SS13","Engine")
network = list("ss13","engine")
},
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/unary/thermomachine/heater{
@@ -11684,7 +11684,7 @@
/obj/machinery/camera{
c_tag = "Supermatter Engine - Aft";
name = "atmospherics camera";
network = list("SS13","Engine")
network = list("ss13","engine")
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -12900,7 +12900,7 @@
c_tag = "Prison - Garden";
dir = 2;
name = "prison camera";
network = list("SS13","prison")
network = list("ss13","prison")
},
/turf/open/floor/plasteel/neutral/side{
dir = 1
@@ -17780,7 +17780,7 @@
c_tag = "Prison - Relaxation Area";
dir = 1;
name = "prison camera";
network = list("SS13","prison")
network = list("ss13","prison")
},
/turf/open/floor/plating,
/area/security/prison)
@@ -19590,7 +19590,7 @@
c_tag = "Prison - Cell 3";
dir = 2;
name = "prison camera";
network = list("SS13","prison")
network = list("ss13","prison")
},
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -19630,7 +19630,7 @@
c_tag = "Prison - Cell 2";
dir = 2;
name = "prison camera";
network = list("SS13","prison")
network = list("ss13","prison")
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -19662,7 +19662,7 @@
c_tag = "Prison - Cell 1";
dir = 2;
name = "prison camera";
network = list("SS13","prison")
network = list("ss13","prison")
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -29378,7 +29378,7 @@
"bpg" = (
/obj/machinery/computer/security{
name = "Labor Camp Monitoring";
network = list("Labor")
network = list("labor")
},
/obj/item/device/radio/intercom{
name = "Station Intercom";
@@ -29694,7 +29694,7 @@
c_tag = "AI Satellite - Fore";
dir = 1;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -32973,7 +32973,7 @@
/obj/machinery/camera/motion{
c_tag = "AI Chamber - Fore";
name = "motion-sensitive ai camera";
network = list("AI")
network = list("ai")
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
@@ -33462,8 +33462,7 @@
"bxe" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
dir = 4;
network = list("SS13")
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -33589,7 +33588,7 @@
c_tag = "AI Satellite - Fore Port";
dir = 8;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -33649,7 +33648,7 @@
c_tag = "AI Satellite - Fore Starboard";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -35403,7 +35402,7 @@
dir = 4;
layer = 4;
name = "Engine Monitor";
network = list("Engine");
network = list("engine");
pixel_x = -24
},
/turf/open/floor/plasteel/caution{
@@ -35744,7 +35743,7 @@
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
name = "Research Monitor";
network = list("RD","Sat");
network = list("rd","minisat");
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
@@ -41547,7 +41546,7 @@
c_tag = "Telecomms - Monitoring";
dir = 2;
name = "telecomms camera";
network = list("SS13","tcomm")
network = list("ss13","tcomm")
},
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
@@ -42033,7 +42032,7 @@
c_tag = "AI Chamber - Aft";
dir = 1;
name = "motion-sensitive ai camera";
network = list("AI")
network = list("ai")
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/ai)
@@ -42974,7 +42973,7 @@
c_tag = "AI Satellite - Port";
dir = 8;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -43042,7 +43041,7 @@
c_tag = "AI Satellite - Starboard";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -43954,7 +43953,7 @@
c_tag = "AI Satellite - Antechamber";
dir = 2;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault,
@@ -44798,8 +44797,7 @@
"bTl" = (
/obj/machinery/camera/motion{
c_tag = "Armoury - Exterior";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/space,
/area/space/nearstation)
@@ -44874,7 +44872,7 @@
c_tag = "AI Satellite - Maintenance";
dir = 8;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/stripes/line,
@@ -44962,7 +44960,7 @@
c_tag = "AI Satellite - Teleporter";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -45078,7 +45076,7 @@
c_tag = "AI Satellite - Transit Tube";
dir = 2;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/obj/item/clipboard,
@@ -46442,7 +46440,7 @@
desc = "Used for watching the AI's satellite.";
dir = 4;
name = "Research Monitor";
network = list("Sat");
network = list("minisat");
pixel_y = 2
},
/turf/open/floor/plasteel/vault{
@@ -46489,7 +46487,7 @@
dir = 4;
layer = 4;
name = "Engine Monitor";
network = list("Engine");
network = list("engine");
pixel_x = -30
},
/mob/living/simple_animal/parrot/Poly,
@@ -49781,7 +49779,7 @@
c_tag = "Telecomms - Chamber Port";
dir = 4;
name = "telecomms camera";
network = list("SS13","tcomm")
network = list("ss13","tcomm")
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 8
@@ -50225,7 +50223,7 @@
/obj/machinery/camera/motion{
c_tag = "AI - Upload";
name = "motion-sensitive ai camera";
network = list("Sat")
network = list("minisat")
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/ai_upload)
@@ -51319,7 +51317,7 @@
/obj/machinery/camera/emp_proof{
c_tag = "Containment - Fore Starboard";
dir = 8;
network = list("Singularity")
network = list("singularity")
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
@@ -51668,7 +51666,7 @@
c_tag = "Telecomms - Chamber Starboard";
dir = 8;
name = "telecomms camera";
network = list("SS13","tcomm")
network = list("ss13","tcomm")
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 8
@@ -53036,7 +53034,7 @@
/obj/machinery/camera/emp_proof{
c_tag = "Containment - Fore Port";
dir = 4;
network = list("Singularity")
network = list("singularity")
},
/turf/open/space,
/area/space/nearstation)
@@ -53334,8 +53332,7 @@
/obj/machinery/camera/motion{
c_tag = "Bridge - Captain's Emergency Escape";
dir = 4;
name = "command camera";
network = list("SS13")
name = "command camera"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -55094,7 +55091,7 @@
c_tag = "AI Satellite - Aft Port";
dir = 8;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -55169,7 +55166,7 @@
c_tag = "AI Satellite - Aft Starboard";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault{
@@ -55473,7 +55470,7 @@
c_tag = "Telecomms - Cooling Room";
dir = 8;
name = "telecomms camera";
network = list("SS13","tcomm")
network = list("ss13","tcomm")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -57092,7 +57089,7 @@
dir = 4;
layer = 4;
name = "Engine Containment Telescreen";
network = list("Singularity");
network = list("singularity");
pixel_x = -30
},
/obj/effect/turf_decal/stripes/line{
@@ -58650,7 +58647,7 @@
/obj/machinery/camera/emp_proof{
c_tag = "Containment - Particle Accelerator";
dir = 1;
network = list("Singularity")
network = list("singularity")
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -61344,7 +61341,7 @@
/obj/machinery/camera/emp_proof{
c_tag = "Containment - Aft Port";
dir = 4;
network = list("Singularity")
network = list("singularity")
},
/turf/open/space,
/area/space/nearstation)
@@ -62961,7 +62958,7 @@
/obj/machinery/camera/emp_proof{
c_tag = "Containment - Aft Starboard";
dir = 8;
network = list("Singularity")
network = list("singularity")
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
@@ -67620,7 +67617,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology - Cell 1";
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -67633,7 +67630,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology - Cell 2";
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -67646,7 +67643,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology - Cell 3";
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -67663,7 +67660,7 @@
c_tag = "Xenobiology - Killroom Chamber";
dir = 2;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault/killroom,
/area/science/xenobiology)
@@ -69712,7 +69709,7 @@
c_tag = "Xenobiology - Port";
dir = 2;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -72180,7 +72177,7 @@
c_tag = "Xenobiology - Secure Cell";
dir = 4;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -72394,7 +72391,7 @@
c_tag = "Science - Fore";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 4
@@ -72454,7 +72451,7 @@
c_tag = "Security Post - Science";
dir = 8;
name = "security camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -72505,7 +72502,7 @@
c_tag = "Science - Waiting Room";
dir = 1;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 8
@@ -73201,7 +73198,7 @@
c_tag = "Xenobiology - Starboard";
dir = 8;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -74963,7 +74960,7 @@
c_tag = "Science - Research Division Access";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -76222,7 +76219,7 @@
c_tag = "Science - Research and Development";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner,
/area/science/lab)
@@ -76290,7 +76287,7 @@
c_tag = "Medbay - Chemistry";
dir = 8;
name = "medbay camera";
network = list("SS13","Medbay")
network = list("ss13","medbay")
},
/turf/open/floor/plasteel/whiteyellow/corner,
/area/medical/chemistry)
@@ -76676,7 +76673,7 @@
c_tag = "Xenobiology - Cell 4";
dir = 1;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -76688,7 +76685,7 @@
c_tag = "Xenobiology - Cell 5";
dir = 1;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -76700,7 +76697,7 @@
c_tag = "Xenobiology - Cell 6";
dir = 1;
name = "xenobiology camera";
network = list("SS13","xeno","RD")
network = list("ss13","xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -76745,7 +76742,7 @@
c_tag = "Science - Port";
dir = 2;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
@@ -76812,7 +76809,7 @@
c_tag = "Science - Center";
dir = 2;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
@@ -77966,7 +77963,7 @@
desc = "Used for watching the RD's goons from the safety of his office.";
dir = 4;
name = "Research Monitor";
network = list("RD");
network = list("rd");
pixel_x = -28
},
/turf/open/floor/plasteel/white/corner,
@@ -78125,7 +78122,7 @@
c_tag = "Science - Experimentation Lab";
dir = 2;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -79526,7 +79523,7 @@
c_tag = "Science - Lab Access";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -81872,7 +81869,7 @@
desc = "Used for watching the RD's goons from the safety of his office.";
dir = 4;
name = "Research Monitor";
network = list("RD");
network = list("rd");
pixel_x = -28
},
/turf/open/floor/plasteel/white/corner{
@@ -82119,7 +82116,7 @@
c_tag = "Science - Research Director's Office";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -83970,7 +83967,7 @@
c_tag = "Science - Experimentor";
dir = 1;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -83985,7 +83982,7 @@
c_tag = "Science - Toxins Mixing Lab Fore";
dir = 4;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/escape{
dir = 8
@@ -84027,7 +84024,7 @@
c_tag = "Science - Firing Range";
dir = 4;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -84124,7 +84121,7 @@
c_tag = "Science - Aft Center";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner,
/area/science/research)
@@ -84167,7 +84164,7 @@
c_tag = "Science - Mech Bay";
dir = 1;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -87081,7 +87078,7 @@
c_tag = "Science - Research Director's Quarters";
dir = 1;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/machinery/modular_computer/console/preset/research{
dir = 1
@@ -87777,7 +87774,7 @@
c_tag = "Science - Robotics Lab";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -88615,7 +88612,7 @@
c_tag = "Science - Toxins Launch Site";
dir = 2;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -88730,7 +88727,7 @@
c_tag = "Science - Toxins Mixing Lab Aft";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -89358,7 +89355,7 @@
dir = 4;
layer = 4;
name = "Testing Site Telescreen";
network = list("Toxins")
network = list("toxins")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -90187,7 +90184,7 @@
c_tag = "Science - Server Room";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/science/server)
@@ -90200,7 +90197,7 @@
c_tag = "Science - Aft";
dir = 4;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/whitepurple/corner{
dir = 8
@@ -90861,7 +90858,7 @@
c_tag = "Science - Toxins Secure Storage";
dir = 4;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -91663,7 +91660,7 @@
invuln = 1;
light = null;
name = "hardened testing camera";
network = list("Toxins");
network = list("toxins");
start_active = 1;
use_power = 0
},
@@ -93003,7 +93000,7 @@
c_tag = "Science - Break Room";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
@@ -100888,7 +100885,7 @@
/obj/machinery/camera{
c_tag = "MiniSat Service Bay";
dir = 8;
network = list("MiniSat");
network = list("minisat");
start_active = 1
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -101032,7 +101029,7 @@
c_tag = "Science - Experimentation Lab";
dir = 2;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/machinery/requests_console{
department = "Circuitry Lab";
@@ -101338,7 +101335,7 @@
c_tag = "Science - Lab Access";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/structure/sign/departments/science{
pixel_x = 32
_maps/map_files/MetaStation/MetaStation.dmm
+296 -453
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Mining/Lavaland.dmm
+18 -18
View File
@@ -98,7 +98,7 @@
/obj/machinery/camera{
c_tag = "Labor Camp Medical";
dir = 8;
network = list("Labor")
network = list("labor")
},
/turf/open/floor/plasteel/white,
/area/mine/laborcamp)
@@ -235,7 +235,7 @@
/obj/machinery/camera{
c_tag = "Labor Camp External";
dir = 4;
network = list("Labor")
network = list("labor")
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -271,7 +271,7 @@
/area/lavaland/surface/outdoors/explored)
"aU" = (
/obj/machinery/flasher{
id = "Labor"
id = "labor"
},
/turf/closed/wall,
/area/mine/laborcamp)
@@ -301,7 +301,7 @@
dir = 1
},
/obj/machinery/button/door{
id = "Labor";
id = "labor";
name = "Labor Camp Lockdown";
pixel_y = 28;
req_access_txt = "2"
@@ -310,7 +310,7 @@
/area/mine/laborcamp)
"ba" = (
/obj/machinery/door/poddoor/preopen{
id = "Labor";
id = "labor";
name = "labor camp blast door"
},
/turf/open/floor/plasteel,
@@ -318,7 +318,7 @@
"bb" = (
/obj/machinery/camera{
c_tag = "Labor Camp Central";
network = list("Labor")
network = list("labor")
},
/turf/open/floor/plasteel,
/area/mine/laborcamp)
@@ -417,7 +417,7 @@
/obj/machinery/camera{
c_tag = "EVA";
dir = 4;
network = list("MINE")
network = list("mine")
},
/obj/machinery/airalarm{
dir = 4;
@@ -718,7 +718,7 @@
},
/obj/machinery/camera{
c_tag = "Labor Camp Monitoring";
network = list("Labor")
network = list("labor")
},
/obj/structure/cable{
icon_state = "0-8"
@@ -847,7 +847,7 @@
"cx" = (
/obj/machinery/computer/security{
name = "Labor Camp Monitoring";
network = list("Labor")
network = list("labor")
},
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
@@ -1217,7 +1217,7 @@
/obj/machinery/camera{
c_tag = "Communications Relay";
dir = 8;
network = list("MINE")
network = list("mine")
},
/obj/effect/baseturf_helper/picky/lava_land/basalt{
whitelist = /turf/open/floor
@@ -1251,7 +1251,7 @@
/obj/machinery/camera{
c_tag = "Sleeper Room";
dir = 1;
network = list("MINE")
network = list("mine")
},
/turf/open/floor/plasteel/white,
/area/mine/living_quarters)
@@ -1315,7 +1315,7 @@
/obj/machinery/camera{
c_tag = "Shuttle Docking Foyer";
dir = 8;
network = list("MINE")
network = list("mine")
},
/obj/machinery/newscaster{
pixel_x = 30;
@@ -1340,7 +1340,7 @@
/obj/machinery/camera{
c_tag = "Processing Area Room";
dir = 8;
network = list("MINE")
network = list("mine")
},
/obj/item/device/radio/intercom{
dir = 8;
@@ -1461,7 +1461,7 @@
"ed" = (
/obj/machinery/camera{
c_tag = "Crew Area Hallway West";
network = list("MINE")
network = list("mine")
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
@@ -1509,7 +1509,7 @@
"ej" = (
/obj/machinery/camera{
c_tag = "Crew Area Hallway East";
network = list("MINE")
network = list("mine")
},
/turf/open/floor/plasteel/purple/corner{
dir = 1
@@ -1875,7 +1875,7 @@
/obj/machinery/camera{
c_tag = "Storage";
dir = 2;
network = list("MINE")
network = list("mine")
},
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plasteel/brown{
@@ -1990,7 +1990,7 @@
/obj/machinery/camera{
c_tag = "Dormitories";
dir = 4;
network = list("MINE")
network = list("mine")
},
/turf/open/floor/plasteel/purple/corner{
dir = 1
@@ -2096,7 +2096,7 @@
/obj/machinery/camera{
c_tag = "Crew Area";
dir = 1;
network = list("MINE")
network = list("mine")
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -32
_maps/map_files/OmegaStation/OmegaStation.dmm
+78 -137
View File
@@ -2574,7 +2574,7 @@
c_tag = "AI Vault - Port";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/stripes/line{
@@ -3515,7 +3515,7 @@
c_tag = "AI Vault - Starboard";
dir = 8;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/obj/effect/turf_decal/stripes/line{
@@ -4081,8 +4081,7 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/camera{
c_tag = "Armoury - Internal";
network = list("Labor")
c_tag = "Armoury - Internal"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -4542,8 +4541,7 @@
dir = 8
},
/obj/machinery/camera{
c_tag = "Security - Cell 1";
network = list("MINE")
c_tag = "Security - Cell 1"
},
/turf/open/floor/plasteel/red/side{
dir = 5
@@ -4569,8 +4567,7 @@
},
/obj/machinery/camera{
c_tag = "Fore Primary Hallway";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/red/corner{
dir = 1
@@ -5967,8 +5964,7 @@
/obj/item/stamp,
/obj/machinery/camera{
c_tag = "Cargo Bay Entrance";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/brown{
dir = 8
@@ -6147,8 +6143,7 @@
dir = 8
},
/obj/machinery/camera{
c_tag = "Security - Cell 2";
network = list("MINE")
c_tag = "Security - Cell 2"
},
/turf/open/floor/plasteel/red/side{
dir = 5
@@ -6521,8 +6516,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Office";
dir = 4;
network = list("MINE")
dir = 4
},
/turf/open/floor/plasteel/red/corner{
dir = 1
@@ -6547,8 +6541,7 @@
"amK" = (
/obj/machinery/camera{
c_tag = "Security - Central";
dir = 4;
network = list("MINE")
dir = 4
},
/turf/open/floor/plasteel/neutral/side{
dir = 8
@@ -6629,8 +6622,7 @@
"amS" = (
/obj/machinery/camera{
c_tag = "Locker Room Toilets";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/hallway/primary/central)
@@ -8505,8 +8497,7 @@
/obj/item/shovel,
/obj/machinery/camera{
c_tag = "Mining Dock";
dir = 4;
network = list("SS13")
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -9015,7 +9006,6 @@
},
/obj/machinery/camera{
c_tag = "Atmospherics Tank 4";
network = list("thunder");
pixel_x = 10
},
/turf/open/floor/plasteel/green/side{
@@ -9418,8 +9408,7 @@
},
/obj/machinery/camera{
c_tag = "Central Diner 3";
dir = 4;
network = list("MINE")
dir = 4
},
/turf/open/floor/plasteel/vault/side{
dir = 4
@@ -10058,8 +10047,7 @@
"atz" = (
/obj/machinery/camera{
c_tag = "Atmospherics Tank 1";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -10454,8 +10442,7 @@
},
/obj/machinery/camera{
c_tag = "Bar";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -10473,8 +10460,7 @@
},
/obj/machinery/camera{
c_tag = "Bar Backroom";
dir = 4;
network = list("MINE")
dir = 4
},
/turf/open/floor/plasteel/vault,
/area/crew_quarters/bar/atrium)
@@ -11736,8 +11722,7 @@
},
/obj/machinery/camera{
c_tag = "Atmospherics East";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/caution{
dir = 4
@@ -11956,8 +11941,7 @@
"axj" = (
/obj/machinery/camera{
c_tag = "Atmospherics Tank 2";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -12059,8 +12043,7 @@
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/camera{
c_tag = "Atmospherics Monitoring";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -12634,8 +12617,7 @@
},
/obj/machinery/camera{
c_tag = "Central Diner 2";
dir = 4;
network = list("MINE")
dir = 4
},
/turf/open/floor/plasteel/vault/side{
dir = 4
@@ -13466,8 +13448,7 @@
/obj/structure/bedsheetbin,
/obj/machinery/camera{
c_tag = "Locker Room East";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/arrival{
@@ -14488,8 +14469,7 @@
},
/obj/machinery/camera{
c_tag = "Central Hallway East";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/neutral/corner{
dir = 1
@@ -15091,8 +15071,7 @@
},
/obj/machinery/camera{
c_tag = "Engineering Secure Storage";
dir = 4;
network = list("SS13")
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/vault/side{
@@ -15337,8 +15316,7 @@
},
/obj/machinery/camera{
c_tag = "Locker Room South";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/vault{
@@ -15695,8 +15673,7 @@
},
/obj/machinery/camera{
c_tag = "SMES Access";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -15739,8 +15716,7 @@
},
/obj/machinery/camera{
c_tag = "Engineering Access";
dir = 8;
network = list("Labor")
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -15877,8 +15853,7 @@
},
/obj/machinery/camera{
c_tag = "Central Diner 1";
dir = 4;
network = list("MINE")
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
@@ -16458,8 +16433,7 @@
"aHg" = (
/obj/machinery/camera{
c_tag = "Gravity Generator Room";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/bot_white/left,
/turf/open/floor/plasteel/vault{
@@ -16559,7 +16533,7 @@
/obj/machinery/camera{
c_tag = "Engineering Fore";
dir = 2;
network = list("SS13","Engine");
network = list("ss13","engine");
pixel_x = 23
},
/turf/open/floor/engine,
@@ -17184,8 +17158,7 @@
},
/obj/machinery/camera{
c_tag = "Engineering Monitoring";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -18010,7 +17983,7 @@
/obj/machinery/camera{
c_tag = "Kitchen Coldroom";
dir = 4;
network = list("MINE")
network = list("mine")
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/kitchen)
@@ -19145,7 +19118,7 @@
/obj/machinery/camera{
c_tag = "Engineering Port";
dir = 4;
network = list("SS13","Engine")
network = list("ss13","engine")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -19171,7 +19144,7 @@
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine");
network = list("engine");
pixel_x = 23
},
/obj/structure/cable{
@@ -19285,7 +19258,7 @@
desc = "Used for watching the Engine.";
dir = 1;
name = "Engine Monitor";
network = list("Engine");
network = list("engine");
pixel_y = -32
},
/obj/machinery/rnd/protolathe/department/engineering,
@@ -19335,8 +19308,7 @@
},
/obj/machinery/camera{
c_tag = "Atmospherics South West";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/neutral/corner{
dir = 8;
@@ -19468,8 +19440,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Hydroponics South";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/vault/side{
@@ -20153,8 +20124,7 @@
icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Aft Primary Hallway 4";
network = list("SS13","Prison")
c_tag = "Aft Primary Hallway 4"
},
/turf/open/floor/plasteel/green/corner{
dir = 1
@@ -20262,8 +20232,7 @@
icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Aft Primary Hallway 3";
network = list("SS13","Prison")
c_tag = "Aft Primary Hallway 3"
},
/turf/open/floor/plasteel/green/corner{
dir = 1
@@ -21100,7 +21069,7 @@
/obj/machinery/camera{
c_tag = "Engineering Aft";
dir = 2;
network = list("SS13","Engine");
network = list("ss13","engine");
pixel_x = 23
},
/obj/machinery/atmospherics/pipe/simple/orange/visible{
@@ -21257,8 +21226,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Aft Primary Hallway 2";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/yellow/corner{
dir = 8
@@ -21535,8 +21503,7 @@
},
/obj/machinery/camera{
c_tag = "Library 2";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/library)
@@ -21685,8 +21652,7 @@
},
/obj/machinery/camera{
c_tag = "Chemistry";
dir = 2;
network = list("SS13")
dir = 2
},
/turf/open/floor/plasteel/whiteyellow/corner{
dir = 1
@@ -22567,8 +22533,7 @@
"aUo" = (
/obj/machinery/camera{
c_tag = "Genetics Cloning";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/whiteblue/corner{
dir = 1
@@ -23136,7 +23101,7 @@
/obj/machinery/camera{
c_tag = "Server Room";
dir = 2;
network = list("SS13","RD");
network = list("ss13","rd");
pixel_x = 22
},
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -23645,8 +23610,7 @@
/obj/structure/closet/crate/bin,
/obj/machinery/camera{
c_tag = "Medbay Morgue";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/vault/side{
dir = 8
@@ -23914,8 +23878,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay West";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -24230,8 +24193,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Storage";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/effect/turf_decal/delivery,
/obj/structure/window/reinforced{
@@ -24495,8 +24457,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Research Division South";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/whitepurple/corner,
/area/science/research)
@@ -25331,7 +25292,7 @@
/obj/machinery/camera{
c_tag = "Robotics Lab";
dir = 2;
network = list("SS13","RD")
network = list("ss13","rd")
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/vault/side,
@@ -25637,8 +25598,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Foyer";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
@@ -26708,8 +26668,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay South";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/whiteblue/corner{
dir = 8
@@ -27226,8 +27185,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/vault/side{
dir = 8
@@ -28451,7 +28409,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology Test Chamber";
dir = 2;
network = list("Xeno","RD")
network = list("xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 4
@@ -28546,7 +28504,7 @@
/obj/machinery/camera{
c_tag = "Crematorium";
dir = 4;
network = list("MINE")
network = list("mine")
},
/turf/open/floor/plasteel/vault/side{
dir = 4
@@ -29231,8 +29189,7 @@
},
/obj/machinery/camera{
c_tag = "Chaplain's Quarters";
dir = 2;
network = list("SS13")
dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -29278,8 +29235,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/camera{
c_tag = "Chapel Office";
dir = 2;
network = list("SS13")
dir = 2
},
/turf/open/floor/wood,
/area/chapel/main)
@@ -29714,8 +29670,7 @@
},
/obj/machinery/camera{
c_tag = "Chapel South";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -29737,8 +29692,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Arrivals Hallway 3";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -29825,7 +29779,7 @@
c_tag = "Science - Server Room";
dir = 8;
name = "science camera";
network = list("SS13","RD")
network = list("ss13","rd")
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/science/xenobiology)
@@ -30413,8 +30367,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Port Primary Hallway";
dir = 4;
network = list("SS13")
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -30431,8 +30384,7 @@
},
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway 2";
dir = 8;
network = list("SS13")
dir = 8
},
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/primary/central)
@@ -30440,8 +30392,7 @@
/obj/structure/closet/firecloset,
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway 2";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/vault/side{
@@ -30464,8 +30415,7 @@
"blk" = (
/obj/machinery/camera{
c_tag = "Atmospherics Tank 3";
dir = 4;
network = list("SS13")
dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -30478,12 +30428,11 @@
/obj/machinery/camera{
c_tag = "Shuttle Docking Foyer";
dir = 8;
network = list("MINE")
network = list("mine")
},
/obj/machinery/camera{
c_tag = "Escape Arm Airlocks";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -30492,8 +30441,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/vault/side{
@@ -30507,7 +30455,7 @@
/obj/machinery/camera{
c_tag = "Engineering Starboard";
dir = 8;
network = list("SS13","Engine")
network = list("ss13","engine")
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -30523,8 +30471,7 @@
},
/obj/machinery/camera{
c_tag = "Research Division Access";
dir = 2;
network = list("SS13")
dir = 2
},
/obj/structure/cable/white{
icon_state = "2-8"
@@ -30538,7 +30485,6 @@
/obj/machinery/camera{
c_tag = "Aft Primary Hallway 1";
dir = 8;
network = list("SS13");
pixel_y = -22
},
/turf/open/floor/plasteel/purple/corner,
@@ -30583,7 +30529,6 @@
/obj/machinery/camera{
c_tag = "Surgery Operating";
dir = 1;
network = list("SS13");
pixel_x = 22
},
/turf/open/floor/plasteel/neutral,
@@ -30592,7 +30537,7 @@
/obj/machinery/camera{
c_tag = "Xenobiology Test Chamber";
dir = 2;
network = list("Xeno","RD")
network = list("xeno","rd")
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -30615,8 +30560,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Arrivals Hallway";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -30627,8 +30571,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Arrivals Hallway 2";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -30685,8 +30628,7 @@
},
/obj/machinery/camera{
c_tag = "Chapel Mass Driver";
dir = 8;
network = list("SS13")
dir = 8
},
/obj/machinery/light/small,
/obj/machinery/button/massdriver{
@@ -31264,8 +31206,7 @@
"buU" = (
/obj/machinery/camera{
c_tag = "Communications Relay";
dir = 8;
network = list("MINE")
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -33064,7 +33005,7 @@
c_tag = "AI Chamber - Core";
dir = 2;
name = "core camera";
network = list("RD")
network = list("rd")
},
/obj/machinery/cell_charger,
/turf/open/floor/plasteel/vault/side,
@@ -33247,7 +33188,7 @@
c_tag = "AI Chamber - Core";
dir = 2;
name = "core camera";
network = list("RD")
network = list("rd")
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -33384,7 +33325,7 @@
c_tag = "AI Chamber - Core";
dir = 2;
name = "core camera";
network = list("RD")
network = list("rd")
},
/obj/machinery/light{
dir = 1
@@ -33617,7 +33558,7 @@
c_tag = "AI Satellite - Access";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault/side{
@@ -33905,7 +33846,7 @@
c_tag = "AI Satellite - Maintenance";
dir = 8;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -33977,7 +33918,7 @@
c_tag = "AI Satellite - Antechamber";
dir = 4;
name = "ai camera";
network = list("Sat");
network = list("minisat");
start_active = 1
},
/turf/open/floor/plasteel/vault/side{
_maps/map_files/PubbyStation/PubbyStation.dmm
+162 -221
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/CentCom.dmm
+1 -1
View File
@@ -6277,7 +6277,7 @@
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
name = "Research Monitor";
network = list("RD","Sat");
network = list("rd","minisat");
pixel_y = 28
},
/turf/open/floor/plasteel/grimy,
code/game/machinery/camera/camera.dm
+4 -1
View File
@@ -17,7 +17,7 @@
armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50)
max_integrity = 100
integrity_failure = 50
var/list/network = list("SS13")
var/list/network = list("ss13")
var/c_tag = null
var/c_tag_order = 999
var/status = TRUE
@@ -44,6 +44,9 @@
/obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/CA)
. = ..()
for(var/i in network)
network -= i
network += lowertext(i)
if(CA)
assembly = CA
else
code/game/machinery/camera/camera_assembly.dm
+3
View File
@@ -99,6 +99,9 @@
if(tempnetwork.len < 1)
to_chat(user, "<span class='warning'>No network found, please hang up and try your call again!</span>")
return
for(var/i in tempnetwork)
tempnetwork -= i
tempnetwork += lowertext(i)
state = 4
var/obj/machinery/camera/C = new(loc, src)
forceMove(C)
code/game/machinery/computer/camera.dm
+8 -2
View File
@@ -5,12 +5,18 @@
icon_keyboard = "security_key"
circuit = /obj/item/circuitboard/computer/security
var/last_pic = 1
var/list/network = list("SS13")
var/list/network = list("ss13")
var/mapping = 0//For the overview file, interesting bit of code.
var/list/watchers = list() //who's using the console, associated with the camera they're on.
light_color = LIGHT_COLOR_RED
/obj/machinery/computer/security/Initialize()
. = ..()
for(var/i in network)
network -= i
network += lowertext(i)
/obj/machinery/computer/security/check_eye(mob/user)
if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind )
user.unset_machine()
@@ -185,5 +191,5 @@
desc = "Used to access the various cameras on the outpost."
icon_screen = "mining"
icon_keyboard = "mining_key"
network = list("MINE")
network = list("mine")
circuit = /obj/item/circuitboard/computer/mining
code/game/machinery/computer/camera_advanced.dm
+5 -2
View File
@@ -7,7 +7,7 @@
var/lock_override = NONE
var/mob/camera/aiEye/remote/eyeobj
var/mob/living/current_user = null
var/list/networks = list("SS13")
var/list/networks = list("ss13")
var/datum/action/innate/camera_off/off_action = new
var/datum/action/innate/camera_jump/jump_action = new
var/list/actions = list()
@@ -16,6 +16,9 @@
/obj/machinery/computer/camera_advanced/Initialize()
. = ..()
for(var/i in networks)
networks -= i
networks += lowertext(i)
if(lock_override)
if(lock_override & CAMERA_LOCK_STATION)
z_lock |= SSmapping.levels_by_trait(ZTRAIT_STATION)
@@ -261,7 +264,7 @@
name = "ratvarian camera observer"
desc = "A console used to snoop on the station's goings-on. A jet of steam occasionally whooshes out from slats on its sides."
use_power = FALSE
networks = list("SS13", "MiniSat") //:eye:
networks = list("ss13", "minisat") //:eye:
var/datum/action/innate/servant_warp/warp_action = new
/obj/machinery/computer/camera_advanced/ratvar/Initialize()
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -76,7 +76,7 @@
for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
if(camera.stat || !camera.can_use())
continue
if(length(list("SS13","MINE")&camera.network))
if(length(list("ss13","mine")&camera.network))
bugged_cameras[camera.c_tag] = camera
sortList(bugged_cameras)
return bugged_cameras
code/modules/antagonists/abductor/machinery/camera.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/camera_advanced/abductor
name = "Human Observation Console"
var/team_number = 0
networks = list("SS13","Abductor")
networks = list("ss13", "abductor")
var/datum/action/innate/teleport_in/tele_in_action = new
var/datum/action/innate/teleport_out/tele_out_action = new
var/datum/action/innate/teleport_self/tele_self_action = new
code/modules/events/camerafailure.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/obj/machinery/camera/C = pick_n_take(cameras)
if (!C)
break
if (!("SS13" in C.network))
if (!("ss13" in C.network))
continue
if(C.status)
C.toggle_cam(null, 0)
code/modules/integrated_electronics/subtypes/output.dm
+1 -1
View File
@@ -256,7 +256,7 @@
/obj/item/integrated_circuit/output/video_camera/New()
..()
camera = new(src)
camera.network = list("RD")
camera.network = list("rd")
on_data_written()
/obj/item/integrated_circuit/output/video_camera/Destroy()
code/modules/mining/aux_base_camera.dm
+1 -1
View File
@@ -29,7 +29,7 @@
/obj/machinery/computer/camera_advanced/base_construction
name = "base construction console"
desc = "An industrial computer integrated with a camera-assisted rapid construction drone."
networks = list("SS13")
networks = list("ss13")
var/obj/item/construction/rcd/internal/RCD //Internal RCD. The computer passes user commands to this in order to avoid massive copypaste.
circuit = /obj/item/circuitboard/computer/base_construction
off_action = new/datum/action/innate/camera_off/base_construction
code/modules/mob/living/silicon/ai/ai.dm
+7 -5
View File
@@ -27,7 +27,7 @@
sec_hud = DATA_HUD_SECURITY_BASIC
d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
mob_size = MOB_SIZE_LARGE
var/list/network = list("SS13")
var/list/network = list("ss13")
var/obj/machinery/camera/current = null
var/list/connected_robots = list()
var/aiRestorePowerRoutine = 0
@@ -149,7 +149,7 @@
GLOB.shuttle_caller_list += src
builtInCamera = new (src)
builtInCamera.network = list("SS13")
builtInCamera.network = list("ss13")
/mob/living/silicon/ai/Destroy()
@@ -567,11 +567,13 @@
var/mob/living/silicon/ai/U = usr
for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
var/list/tempnetwork = C.network
if(!(is_station_level(C.z) || is_mining_level(C.z) || ("ss13" in tempnetwork)))
continue
if(!C.can_use())
continue
var/list/tempnetwork = C.network
tempnetwork.Remove("CREED", "thunder", "RD", "toxins", "Prison")
tempnetwork.Remove("rd", "toxins", "prison")
if(tempnetwork.len)
for(var/i in C.network)
cameralist[i] = i
@@ -591,7 +593,7 @@
if(network in C.network)
U.eyeobj.setLoc(get_turf(C))
break
to_chat(src, "<span class='notice'>Switched to [network] camera network.</span>")
to_chat(src, "<span class='notice'>Switched to the \"[uppertext(network)]\" camera network.</span>")
//End of code by Mord_Sith
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -13,7 +13,7 @@
layer = BELOW_MOB_LAYER
can_be_held = TRUE
var/network = "SS13"
var/network = "ss13"
var/obj/machinery/camera/current = null
var/ram = 100 // Used as currency to purchase different abilities
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -125,7 +125,7 @@
if(!scrambledcodes && !builtInCamera)
builtInCamera = new (src)
builtInCamera.c_tag = real_name
builtInCamera.network = list("SS13")
builtInCamera.network = list("ss13")
builtInCamera.internal_light = FALSE
if(wires.is_cut(WIRE_CAMERA))
builtInCamera.status = 0
code/modules/research/xenobiology/xenobio_camera.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/obj/machinery/computer/camera_advanced/xenobio
name = "Slime management console"
desc = "A computer used for remotely handling slimes."
networks = list("SS13")
networks = list("ss13")
circuit = /obj/item/circuitboard/computer/xenobiology
var/datum/action/innate/slime_place/slime_place_action = new
var/datum/action/innate/slime_pick_up/slime_up_action = new