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

Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909

Browse Source 
[MIRROR] Radiation rework and subsystem
This commit is contained in:
LetterJay
2017-10-13 23:58:04 -04:00
committed by GitHub
parent 243e9d7acb 14dc8a5a35
commit 8aebc3b15a
72 changed files with 831 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+37 -17
View File
@@ -56995,25 +56995,30 @@
/turf/open/floor/plating,
/area/engine/supermatter)
"cEu" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine");
pixel_x = 23
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEv" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEw" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -57028,13 +57033,10 @@
/turf/open/floor/engine,
/area/engine/supermatter)
"cEy" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/turf/open/floor/plating,
/area/engine/supermatter)
"cEz" = (
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
@@ -57042,6 +57044,14 @@
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEz" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEA" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
@@ -57210,18 +57220,28 @@
/turf/open/floor/engine,
/area/engine/engineering)
"cFe" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cFh" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cFj" = (
/obj/machinery/door/poddoor/shutters/preopen{
@@ -89084,8 +89104,8 @@ cDD
cqU
cMD
cEu
cMI
cMI
cEz
cEz
cMD
cFL
cGf
_maps/map_files/Deltastation/DeltaStation2.dmm
+58 -37
View File
@@ -8739,19 +8739,30 @@
/turf/open/floor/plating,
/area/engine/supermatter)
"auC" = (
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine");
pixel_x = 23
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"auD" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"auD" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/engine/supermatter)
"auE" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -8766,24 +8777,24 @@
/turf/open/floor/engine,
/area/engine/supermatter)
"auG" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"auH" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
name = "atmospherics camera";
network = list("Engine")
},
/turf/open/floor/circuit/green,
/turf/open/floor/engine,
/area/engine/supermatter)
"auI" = (
/obj/structure/cable{
@@ -9303,22 +9314,32 @@
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"avP" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"avQ" = (
/obj/machinery/power/supermatter_shard/crystal/engine,
/turf/open/floor/engine,
/area/engine/supermatter)
"avR" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"avS" = (
/obj/structure/cable{
@@ -134418,8 +134439,8 @@ ard
asi
ehy
auC
auC
auC
auH
auH
ehy
azc
aAc
@@ -134675,7 +134696,7 @@ are
asj
ehy
auD
avP
auD
avP
axP
ehJ
@@ -135703,7 +135724,7 @@ ari
asn
ehy
auG
avR
auG
avR
axT
ehJ
@@ -135960,8 +135981,8 @@ ebP
aso
ehy
auH
ehF
ehF
auH
auH
ehy
azg
aAe
_maps/map_files/MetaStation/MetaStation.dmm
+34 -17
View File
@@ -80901,16 +80901,21 @@
},
/area/maintenance/port/fore)
"daY" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"daZ" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/turf/open/floor/engine,
/area/engine/supermatter)
"dbb" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -82721,8 +82726,10 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/turf/open/floor/engine,
/area/engine/supermatter)
"deU" = (
/obj/effect/turf_decal/stripes/line{
@@ -82832,15 +82839,25 @@
/area/engine/supermatter)
"dfk" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/north,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dfm" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/north,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dfp" = (
/obj/effect/turf_decal/bot{
@@ -82853,16 +82870,16 @@
/turf/open/floor/plasteel/black,
/area/engine/engineering)
"dfq" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 4;
network = list("Engine")
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dft" = (
@@ -129531,7 +129548,7 @@ dbb
dfa
aNv
dfk
dlS
daY
djx
dfG
cXz
@@ -129788,7 +129805,7 @@ dbb
aMk
aNv
dfm
dlS
daY
djt
dbg
dfR
_maps/map_files/OmegaStation/OmegaStation.dmm
+45 -32
View File
@@ -1,4 +1,4 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aaa" = (
/turf/open/space/basic,
/area/space)
@@ -22155,25 +22155,30 @@
/turf/open/floor/plating,
/area/engine/supermatter)
"aMR" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/camera{
c_tag = "Engineering Supermatter Chamber";
c_tag = "Supermatter Chamber";
dir = 2;
network = list("SS13","Engine");
network = list("Engine");
pixel_x = 23
},
/turf/open/floor/circuit/green,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"aMS" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"aMT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -22194,16 +22199,21 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"aMX" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/circuit/green,
/turf/open/floor/engine,
/area/engine/supermatter)
"aMY" = (
/obj/structure/cable{
@@ -22838,14 +22848,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aOa" = (
/obj/machinery/power/supermatter_shard/engine{
anchored = 1;
base_icon_state = "darkmatter";
explosion_power = 20;
gasefficency = 0.15;
icon_state = "darkmatter";
name = "supermatter crystal"
},
/obj/machinery/power/supermatter_shard/crystal/engine,
/turf/open/floor/engine,
/area/engine/supermatter)
"aOb" = (
@@ -23106,15 +23109,25 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"aOD" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/area/engine/supermatter)
"aOE" = (
/obj/structure/cable{
@@ -67194,8 +67207,8 @@ aJs
aKz
buW
aMR
buZ
buZ
aMX
aMX
buW
aQK
aRI