Removes roundstart singularity, adds roundstart supermatter, supermatter now collapes into singularity (#24447)

* Adds supermatter to box.
Adds orange pipes.
Makes the supermatter spawn a singulo.

* Added orange pipe manifolds.
Added a supermatter crystal and replaced the varedited shards on box and meta.
Added supermatter engine to metastation.

* Removed singulo from Deltastation.
Gave engineers access to some Deltastation atmos areas, including the engine.
Fixed some access bugs.

* Misc fixes.

* Fixed the roundstart reflectors being impossible to deconstruct.
Bunch chamber tweaks on meta.

* Poly now squawks about the supermatter engine instead of the singulo.
Radiation collectors are now half as efficient.
This commit is contained in:
Tokiko1
2017-02-26 15:20:27 -06:00
committed by KorPhaeron
parent 488dc63205
commit 069443c193
9 changed files with 6010 additions and 2600 deletions
+73 -79
View File
@@ -7342,7 +7342,8 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos{
name = "Reflector Access";
req_access_txt = "24"
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
@@ -7365,7 +7366,8 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos{
name = "Reflector Access";
req_access_txt = "24"
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/stripes/line{
@@ -11355,14 +11357,7 @@
name = "Atmospherics Engine"
})
"avQ" = (
/obj/machinery/power/supermatter_shard{
anchored = 1;
base_icon_state = "darkmatter";
explosion_power = 20;
gasefficency = 0.15;
icon_state = "darkmatter";
name = "supermatter crystal"
},
/obj/machinery/power/supermatter_shard/crystal,
/turf/open/floor/engine,
/area/engine/gravity_generator{
name = "Atmospherics Engine"
@@ -12466,7 +12461,8 @@
"axR" = (
/obj/machinery/door/airlock/glass_atmos{
name = "Supermatter Chamber";
req_access_txt = "24"
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/engine,
/area/engine/gravity_generator{
@@ -16800,10 +16796,6 @@
"aFc" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "24"
},
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -16812,6 +16804,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -16837,14 +16834,15 @@
tag = "icon-1-2";
icon_state = "1-2"
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Engine Access";
req_access_txt = "24"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Engine Access";
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -19054,13 +19052,14 @@
"aJa" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "24"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -19076,13 +19075,14 @@
tag = "icon-1-2";
icon_state = "1-2"
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Engine Access";
req_access_txt = "24"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Engine Access";
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -24868,7 +24868,8 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_atmos{
name = "Atmospherics Storage";
req_access_txt = "24"
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -29946,7 +29947,8 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_atmos{
name = "Atmospherics Storage";
req_access_txt = "24"
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -39091,10 +39093,6 @@
/area/atmos)
"bsB" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "24"
},
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -39102,6 +39100,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -40723,10 +40726,6 @@
/area/engine/break_room)
"bvr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "24"
},
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -40734,6 +40733,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/machinery/door/airlock/atmos{
name = "Atmospherics Access";
req_access_txt = "0";
req_one_access_txt = "24;10"
},
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -58379,10 +58383,6 @@
/area/engine/engineering)
"bZg" = (
/obj/structure/cable/white,
/obj/machinery/power/emitter{
anchored = 1;
state = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -58441,6 +58441,7 @@
},
/obj/structure/fans/tiny,
/obj/effect/turf_decal/delivery,
/obj/structure/barricade/wooden,
/turf/open/floor/plasteel,
/area/engine/engineering)
"bZm" = (
@@ -61640,6 +61641,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"ceF" = (
@@ -62295,7 +62297,6 @@
/turf/open/space,
/area/space)
"cfU" = (
/obj/machinery/power/grounding_rod,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -62308,7 +62309,6 @@
/turf/open/floor/plating/airless,
/area/space)
"cfW" = (
/obj/machinery/power/tesla_coil,
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -62316,7 +62316,6 @@
/turf/open/floor/plating/airless,
/area/space)
"cfX" = (
/obj/machinery/power/grounding_rod,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -62353,6 +62352,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"cfZ" = (
@@ -63060,6 +63060,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"chu" = (
@@ -64047,7 +64048,6 @@
/turf/open/space,
/area/space)
"ciY" = (
/obj/machinery/power/tesla_coil,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
@@ -64078,6 +64078,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/structure/barricade/wooden,
/turf/open/floor/plasteel{
tag = "icon-plasteel_warn_side (EAST)"
},
@@ -64801,6 +64802,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"ckw" = (
@@ -65459,14 +65461,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"clN" = (
/obj/structure/particle_accelerator/particle_emitter/left{
tag = "icon-emitter_left (WEST)";
icon_state = "emitter_left";
dir = 8
},
/turf/open/floor/plating,
/area/engine/engineering)
"clO" = (
@@ -65476,7 +65474,6 @@
/turf/open/floor/plating,
/area/engine/engineering)
"clP" = (
/obj/machinery/particle_accelerator/control_box,
/obj/structure/cable,
/turf/open/floor/plating,
/area/engine/engineering)
@@ -65514,6 +65511,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plasteel,
/area/engine/engineering)
"clT" = (
@@ -66147,6 +66145,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"cni" = (
@@ -66215,7 +66214,9 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cno" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/start{
name = "Station Engineer"
},
/turf/open/floor/plasteel/yellow,
/area/engine/engineering)
"cnp" = (
@@ -67965,6 +67966,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"cqj" = (
@@ -68058,7 +68060,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cqs" = (
/obj/machinery/the_singularitygen,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -69474,6 +69475,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"csX" = (
@@ -70471,7 +70473,6 @@
name = "\improper Recreation Area"
})
"cuI" = (
/obj/machinery/power/grounding_rod,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
@@ -70482,7 +70483,6 @@
/turf/open/floor/plating/airless,
/area/space)
"cuK" = (
/obj/machinery/power/tesla_coil,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
@@ -70491,7 +70491,6 @@
/turf/open/floor/plating/airless,
/area/space)
"cuL" = (
/obj/machinery/power/grounding_rod,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -70525,6 +70524,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/engine/engineering)
"cuN" = (
@@ -74202,13 +74202,6 @@
tag = "icon-0-2";
icon_state = "0-2"
},
/obj/machinery/power/emitter{
tag = "icon-emitter (NORTH)";
icon_state = "emitter";
dir = 1;
anchored = 1;
state = 2
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/engine/engineering)
@@ -74273,6 +74266,7 @@
},
/obj/structure/fans/tiny,
/obj/effect/turf_decal/delivery,
/obj/structure/barricade/wooden,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cBb" = (
@@ -139379,15 +139373,15 @@ cbd
aaa
cez
cfV
chp
clJ
aaf
aaf
clI
cho
aaa
aaH
aaf
aaf
csS
coI
cuJ
cez
aaa
@@ -140150,7 +140144,7 @@ cbd
aaH
cez
cfV
chq
cfV
aaH
aaH
clJ
@@ -140410,9 +140404,9 @@ cfW
aaa
aaf
aaH
clK
cfV
cnd
coJ
cuJ
aaH
aaf
aaa
@@ -140672,7 +140666,7 @@ cne
coK
aaH
aaH
csT
cuJ
cuJ
cez
aaH
@@ -141435,15 +141429,15 @@ cbd
aaa
cez
cfV
chr
clL
aaf
aaf
aaH
aaa
coL
cne
aaf
aaf
csU
coK
cuJ
cez
aaa
@@ -142467,8 +142461,8 @@ ceD
ceC
ckw
clN
cni
coM
clN
clN
cqj
ceC
csV
@@ -142723,8 +142717,8 @@ cfY
cht
ciZ
ckw
clO
cnj
clN
clN
coN
cqk
ciZ
@@ -142981,7 +142975,7 @@ chu
cja
ckx
clP
cnk
clN
coO
cql
cja
@@ -143238,7 +143232,7 @@ chv
cjb
cky
clQ
cnl
clN
coP
cqm
cjb
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -108,3 +108,13 @@
/obj/machinery/atmospherics/pipe/manifold/green/hidden
level = 1
/obj/machinery/atmospherics/pipe/manifold/orange
pipe_color=rgb(255,127,39)
color=rgb(255,127,39)
/obj/machinery/atmospherics/pipe/manifold/orange/visible
level = 2
/obj/machinery/atmospherics/pipe/manifold/orange/hidden
level = 1
@@ -99,3 +99,13 @@
/obj/machinery/atmospherics/pipe/manifold4w/green/hidden
level = 1
/obj/machinery/atmospherics/pipe/manifold4w/orange
pipe_color=rgb(255,127,39)
color=rgb(255,127,39)
/obj/machinery/atmospherics/pipe/manifold4w/orange/visible
level = 2
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden
level = 1
@@ -110,3 +110,13 @@ The regular pipe you see everywhere, including bent ones.
/obj/machinery/atmospherics/pipe/simple/green/hidden
level = 1
/obj/machinery/atmospherics/pipe/simple/orange
pipe_color=rgb(255,127,39)
color=rgb(255,127,39)
/obj/machinery/atmospherics/pipe/simple/orange/visible
level = 2
/obj/machinery/atmospherics/pipe/simple/orange/hidden
level = 1
@@ -868,7 +868,7 @@
/mob/living/simple_animal/parrot/Poly
name = "Poly"
desc = "Poly the Parrot. An expert on quantum cracker theory."
speak = list("Poly wanna cracker!", ":e Check the singulo, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS FREE CALL THE SHUTTLE")
speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
gold_core_spawnable = 0
speak_chance = 3
var/memory_saved = 0
+1 -1
View File
@@ -129,7 +129,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/proc/receive_pulse(pulse_strength)
if(loaded_tank && active)
var/power_produced = loaded_tank.air_contents.gases["plasma"] ? loaded_tank.air_contents.gases["plasma"][MOLES] : 0
power_produced *= pulse_strength*20
power_produced *= pulse_strength*10
add_avail(power_produced)
last_power = power_produced
return
+15 -2
View File
@@ -91,9 +91,12 @@
. = ..()
/obj/machinery/power/supermatter_shard/proc/explode()
investigate_log("has exploded.", "supermatter")
explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1, 1)
investigate_log("has collapsed into a singularity.", "supermatter")
var/turf/T = get_turf(src)
qdel(src)
if(T)
var/obj/singularity/S = new(T)
S.energy = 800
/obj/machinery/power/supermatter_shard/process()
var/turf/T = loc
@@ -352,3 +355,13 @@
/obj/machinery/power/supermatter_shard/hugbox
takes_damage = 0
produces_gas = 0
/obj/machinery/power/supermatter_shard/crystal
name = "supermatter crystal"
desc = "A strangely translucent and iridescent crystal. <span class='danger'>You get headaches just from looking at it.</span>"
base_icon_state = "darkmatter"
icon_state = "darkmatter"
anchored = 1
gasefficency = 0.15
explosion_power = 20