[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise * rej clean up + manual sync * maps and .rej file cleanup * sprite and WGW memes * actual spellchecked memes * some other map fix memes * fuck it, let's just hard sync maps * dumb paperwork shit for maps * Revert "dumb paperwork shit for maps" This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d. * *autistic screeching* * REEEEEEEEEEEEEEEEEEEEE * Fuck off I want to do something else
This commit is contained in:
CitadelStationBot
committed by
Poojawa
Poojawa
parent
76f7fcef9a
commit
8a4ddbe8a8
File diff suppressed because it is too large
Load Diff
@@ -1,92 +0,0 @@
|
||||
diff a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm (rejected hunks)
|
||||
@@ -33644,7 +33645,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4;
|
||||
external_pressure_bound = 140;
|
||||
- pressure_checks = 0
|
||||
+ pressure_checks = 0;
|
||||
name = "server vent"
|
||||
},
|
||||
/turf/open/floor/circuit{
|
||||
@@ -83911,12 +83912,12 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
cTg
|
||||
-cTl
|
||||
-cTn
|
||||
-cTr
|
||||
-cTu
|
||||
-cTw
|
||||
-cTz
|
||||
+cTg
|
||||
+cTi
|
||||
+cTg
|
||||
+cTi
|
||||
+cTg
|
||||
+cTg
|
||||
aaa
|
||||
bCq
|
||||
bPS
|
||||
@@ -84167,13 +84168,13 @@ aaa
|
||||
aaa
|
||||
aaa
|
||||
aaa
|
||||
-cTh
|
||||
+cTg
|
||||
bGg
|
||||
cTo
|
||||
cMl
|
||||
bHx
|
||||
cTx
|
||||
-cTA
|
||||
+cTg
|
||||
aaa
|
||||
bLv
|
||||
bPR
|
||||
@@ -84427,7 +84428,7 @@ bDi
|
||||
cTi
|
||||
bGh
|
||||
bHx
|
||||
-cTs
|
||||
+cTo
|
||||
bHx
|
||||
bLt
|
||||
bMF
|
||||
@@ -84681,13 +84682,13 @@ bzP
|
||||
bAS
|
||||
bxu
|
||||
aaa
|
||||
-cTj
|
||||
+cTg
|
||||
bGg
|
||||
-cTp
|
||||
-cTt
|
||||
+cTo
|
||||
+cTo
|
||||
bHx
|
||||
bLs
|
||||
-cTB
|
||||
+cTg
|
||||
aaa
|
||||
bLv
|
||||
bPT
|
||||
@@ -84938,13 +84939,13 @@ bzR
|
||||
byd
|
||||
bxx
|
||||
aaa
|
||||
-cTk
|
||||
-cTm
|
||||
-cTq
|
||||
+cTg
|
||||
+cTg
|
||||
+cTi
|
||||
bJc
|
||||
-cTv
|
||||
-cTy
|
||||
-cTC
|
||||
+cTi
|
||||
+cTg
|
||||
+cTg
|
||||
aaa
|
||||
bCq
|
||||
bPV
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,10 +0,0 @@
|
||||
diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks)
|
||||
@@ -94667,7 +94667,7 @@
|
||||
"dzo" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 2;
|
||||
- name = "Starboard Asteroid Maintenace APC";
|
||||
+ name = "Starboard Asteroid Maintenance APC";
|
||||
pixel_y = -24
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/end{
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,37 +0,0 @@
|
||||
diff a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm (rejected hunks)
|
||||
@@ -156131,16 +156132,16 @@ cim
|
||||
brN
|
||||
brN
|
||||
bqq
|
||||
-coe
|
||||
+bkT
|
||||
cpL
|
||||
-cqZ
|
||||
+brH
|
||||
csr
|
||||
-cub
|
||||
+bmI
|
||||
cvE
|
||||
cwY
|
||||
-cqZ
|
||||
-cqZ
|
||||
-cqZ
|
||||
+brH
|
||||
+brH
|
||||
+brH
|
||||
brH
|
||||
bkT
|
||||
cFG
|
||||
@@ -156166,10 +156167,10 @@ djZ
|
||||
dlM
|
||||
dnc
|
||||
doh
|
||||
-dpQ
|
||||
+dnc
|
||||
drt
|
||||
dsT
|
||||
-dpQ
|
||||
+dnc
|
||||
ego
|
||||
dwO
|
||||
dyc
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,37 +0,0 @@
|
||||
diff a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm (rejected hunks)
|
||||
@@ -45922,7 +45922,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
|
||||
dir = 8;
|
||||
frequency = 1441;
|
||||
- id_tag = "n2o_out"
|
||||
+ id_tag = "n2o_out";
|
||||
name = "n2o out"
|
||||
},
|
||||
/turf/open/floor/engine/n2o,
|
||||
@@ -49223,7 +49223,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
|
||||
dir = 8;
|
||||
frequency = 1441;
|
||||
- id_tag = "tox_out"
|
||||
+ id_tag = "tox_out";
|
||||
name = "toxin out"
|
||||
},
|
||||
/turf/open/floor/engine/plasma,
|
||||
@@ -52023,7 +52023,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
|
||||
dir = 8;
|
||||
frequency = 1441;
|
||||
- id_tag = "co2_out"
|
||||
+ id_tag = "co2_out";
|
||||
name = "co2 out"
|
||||
},
|
||||
/turf/open/floor/engine/co2,
|
||||
@@ -58890,7 +58890,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
|
||||
dir = 1;
|
||||
frequency = 1441;
|
||||
- id_tag = "n2_out"
|
||||
+ id_tag = "n2_out";
|
||||
name = "n2 out"
|
||||
},
|
||||
/turf/open/floor/engine/n2,
|
||||
File diff suppressed because it is too large
Load Diff
+57433
-55491
File diff suppressed because it is too large
Load Diff
@@ -1,213 +0,0 @@
|
||||
diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm (rejected hunks)
|
||||
@@ -17662,7 +17662,7 @@
|
||||
/obj/machinery/conveyor_switch/oneway{
|
||||
convdir = 1;
|
||||
id = "garbagestacked";
|
||||
- name = "disposal coveyor"
|
||||
+ name = "disposal conveyor"
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/floor/plating{
|
||||
@@ -19866,7 +19866,7 @@
|
||||
/obj/machinery/conveyor_switch/oneway{
|
||||
convdir = -1;
|
||||
id = "garbage";
|
||||
- name = "disposal coveyor"
|
||||
+ name = "disposal conveyor"
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
@@ -29076,7 +29076,7 @@
|
||||
/area/science/explab)
|
||||
"blV" = (
|
||||
/obj/structure/sign/atmosplaque{
|
||||
- desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the uncorruptable cyborg servants of tomorrow, available today.";
|
||||
+ desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today.";
|
||||
icon_state = "kiddieplaque";
|
||||
name = "\improper 'Perfect Drone' sign";
|
||||
pixel_y = 32
|
||||
@@ -31843,7 +31843,7 @@
|
||||
/area/science/xenobiology)
|
||||
"brT" = (
|
||||
/obj/machinery/computer/security/telescreen{
|
||||
- name = "Test Chamber Moniter";
|
||||
+ name = "Test Chamber Monitor";
|
||||
network = list("Xeno");
|
||||
pixel_y = 2
|
||||
},
|
||||
@@ -36758,7 +36758,7 @@
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 8;
|
||||
freerange = 1;
|
||||
- name = "Station Intercom (Telecoms)";
|
||||
+ name = "Station Intercom (Telecomms)";
|
||||
pixel_x = 28;
|
||||
pixel_y = 24
|
||||
},
|
||||
@@ -42005,7 +42005,7 @@
|
||||
/obj/item/device/radio/intercom{
|
||||
dir = 8;
|
||||
freerange = 1;
|
||||
- name = "Station Intercom (Telecoms)";
|
||||
+ name = "Station Intercom (Telecomms)";
|
||||
pixel_y = 26
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -49228,7 +49228,7 @@
|
||||
/area/chapel/main/monastery)
|
||||
"ccI" = (
|
||||
/obj/machinery/door/airlock/centcom{
|
||||
- name = "Chape Access";
|
||||
+ name = "Chapel Access";
|
||||
opacity = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/black,
|
||||
@@ -50408,7 +50408,7 @@
|
||||
/area/engine/engineering)
|
||||
"cfs" = (
|
||||
/obj/machinery/camera{
|
||||
- c_tag = "Engineering Telecoms Access";
|
||||
+ c_tag = "Engineering Telecomms Access";
|
||||
dir = 8;
|
||||
network = list("Labor")
|
||||
},
|
||||
@@ -50416,11 +50416,11 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/computer/security/telescreen{
|
||||
- desc = "Used for watching telecoms.";
|
||||
+ desc = "Used for watching telecomms.";
|
||||
dir = 8;
|
||||
layer = 4;
|
||||
- name = "Telecoms Telescreen";
|
||||
- network = list("Telecoms");
|
||||
+ name = "Telecomms Telescreen";
|
||||
+ network = list("Telecomms");
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -52887,9 +52887,9 @@
|
||||
/area/space)
|
||||
"clu" = (
|
||||
/obj/machinery/camera{
|
||||
- c_tag = "Telecoms External Fore";
|
||||
+ c_tag = "Telecomms External Fore";
|
||||
dir = 1;
|
||||
- network = list("SS13, Telecoms");
|
||||
+ network = list("SS13, Telecomms");
|
||||
start_active = 1
|
||||
},
|
||||
/turf/open/space,
|
||||
@@ -53072,9 +53072,9 @@
|
||||
/area/tcommsat/computer)
|
||||
"clX" = (
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms External Access";
|
||||
+ c_tag = "Telecomms External Access";
|
||||
dir = 1;
|
||||
- network = list("SS13","Telecoms")
|
||||
+ network = list("SS13","Telecomms")
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/tcommsat/computer)
|
||||
@@ -53136,9 +53136,9 @@
|
||||
"cmg" = (
|
||||
/obj/machinery/requests_console{
|
||||
announcementConsole = 1;
|
||||
- department = "Telecoms Admin";
|
||||
+ department = "Telecomms Admin";
|
||||
departmentType = 5;
|
||||
- name = "Telecoms RC";
|
||||
+ name = "Telecomms RC";
|
||||
pixel_y = 30
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
@@ -53169,9 +53169,9 @@
|
||||
pixel_y = 26
|
||||
},
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms Monitoring";
|
||||
+ c_tag = "Telecomms Monitoring";
|
||||
dir = 2;
|
||||
- network = list("SS13","Telecoms")
|
||||
+ network = list("SS13","Telecomms")
|
||||
},
|
||||
/turf/open/floor/plasteel/yellow/side{
|
||||
dir = 1
|
||||
@@ -53197,7 +53197,7 @@
|
||||
"cmk" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 1;
|
||||
- name = "Telecoms Monitoring APC";
|
||||
+ name = "Telecomms Monitoring APC";
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/structure/cable{
|
||||
@@ -53282,9 +53282,9 @@
|
||||
"cmt" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms External Port";
|
||||
+ c_tag = "Telecomms External Port";
|
||||
dir = 8;
|
||||
- network = list("Telecoms")
|
||||
+ network = list("Telecomms")
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
@@ -53342,9 +53342,9 @@
|
||||
"cmz" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms External Starboard";
|
||||
+ c_tag = "Telecomms External Starboard";
|
||||
dir = 4;
|
||||
- network = list("Telecoms")
|
||||
+ network = list("Telecomms")
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
@@ -53430,7 +53430,7 @@
|
||||
cell_type = 5000;
|
||||
dir = 1;
|
||||
layer = 4;
|
||||
- name = "Telecoms Server APC";
|
||||
+ name = "Telecomms Server APC";
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/cable,
|
||||
@@ -53719,9 +53719,9 @@
|
||||
/area/tcommsat/server)
|
||||
"cnu" = (
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms Server Room";
|
||||
+ c_tag = "Telecomms Server Room";
|
||||
dir = 1;
|
||||
- network = list("SS13","Telecoms")
|
||||
+ network = list("SS13","Telecomms")
|
||||
},
|
||||
/turf/open/floor/plasteel/black{
|
||||
initial_gas_mix = "n2=100;TEMP=80"
|
||||
@@ -53758,18 +53758,18 @@
|
||||
"cny" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms External Port Aft";
|
||||
+ c_tag = "Telecomms External Port Aft";
|
||||
dir = 2;
|
||||
- network = list("Telecoms")
|
||||
+ network = list("Telecomms")
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
"cnz" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/camera/motion{
|
||||
- c_tag = "Telecoms External Starboard Aft";
|
||||
+ c_tag = "Telecomms External Starboard Aft";
|
||||
dir = 2;
|
||||
- network = list("Telecoms")
|
||||
+ network = list("Telecomms")
|
||||
},
|
||||
/turf/open/space,
|
||||
/area/space)
|
||||
@@ -2454,7 +2454,6 @@
|
||||
/area/ctf)
|
||||
"hf" = (
|
||||
/obj/machinery/power/emitter/energycannon{
|
||||
icon_state = "emitter";
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -3513,11 +3512,7 @@
|
||||
},
|
||||
/area/centcom/supply)
|
||||
"jZ" = (
|
||||
/obj/structure/closet/secure_closet{
|
||||
anchored = 1;
|
||||
name = "Contraband Locker";
|
||||
req_access_txt = "19"
|
||||
},
|
||||
/obj/structure/closet/secure_closet/contraband/heads,
|
||||
/turf/open/floor/plasteel/vault{
|
||||
dir = 8
|
||||
},
|
||||
@@ -3586,7 +3581,7 @@
|
||||
"ki" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/weapon/phone{
|
||||
desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in.";
|
||||
desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -5142,7 +5137,7 @@
|
||||
"nX" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/weapon/phone{
|
||||
desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in.";
|
||||
desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -8399,7 +8394,7 @@
|
||||
"vR" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/weapon/phone{
|
||||
desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in.";
|
||||
desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -10687,7 +10682,6 @@
|
||||
/obj/machinery/door/airlock/silver{
|
||||
name = "Shower"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/tdome/tdomeobserve)
|
||||
"BK" = (
|
||||
@@ -12188,7 +12182,7 @@
|
||||
"Fu" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/weapon/phone{
|
||||
desc = "Supposedly a direct line to NanoTrasen Central Command. It's not even plugged in.";
|
||||
desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in.";
|
||||
pixel_x = -3;
|
||||
pixel_y = 3
|
||||
},
|
||||
@@ -14384,6 +14378,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gf
|
||||
Gv
|
||||
GF
|
||||
@@ -14468,12 +14468,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gf
|
||||
Gv
|
||||
GF
|
||||
@@ -14640,6 +14634,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Ga
|
||||
Gg
|
||||
GA
|
||||
@@ -14724,12 +14724,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Ga
|
||||
Gg
|
||||
Ht
|
||||
@@ -14897,6 +14891,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gb
|
||||
Gm
|
||||
Gx
|
||||
@@ -14981,12 +14981,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gb
|
||||
Hn
|
||||
Gx
|
||||
@@ -15154,6 +15148,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gc
|
||||
Gn
|
||||
Gx
|
||||
@@ -15238,12 +15238,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gc
|
||||
Ho
|
||||
Gx
|
||||
@@ -15411,6 +15405,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gd
|
||||
Go
|
||||
Gx
|
||||
@@ -15495,12 +15495,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gd
|
||||
Hp
|
||||
Gx
|
||||
@@ -15668,6 +15662,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Ge
|
||||
Gk
|
||||
Gy
|
||||
@@ -15752,12 +15752,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Ge
|
||||
Gk
|
||||
Gy
|
||||
@@ -15926,6 +15920,12 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gl
|
||||
Gz
|
||||
GL
|
||||
@@ -16010,12 +16010,6 @@ aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
aa
|
||||
Gl
|
||||
Gz
|
||||
GL
|
||||
@@ -26983,6 +26977,11 @@ hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
lF
|
||||
hq
|
||||
hq
|
||||
@@ -27011,11 +27010,6 @@ hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
hq
|
||||
Kl
|
||||
hm
|
||||
aa
|
||||
|
||||
Reference in New Issue
Block a user