Event overhaul from Bay, atmos fixes

This commit is contained in:
Markolie
2015-01-21 23:05:59 +01:00
parent 183362eabd
commit 956f2ba703
83 changed files with 1093 additions and 8446 deletions
+3
View File
@@ -486,6 +486,9 @@ var/global/datum/controller/gameticker/ticker
scoreboard()
karmareminder()
//Ask the event manager to print round end information
event_manager.RoundEnd()
return 1
+7 -7
View File
@@ -475,7 +475,7 @@ Buildable meters
if(PIPE_HE_STRAIGHT, PIPE_HE_BENT)
var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/P = new ( src.loc )
P.dir = src.dir
P.initialize_directions = 0
P.initialize_directions = pipe_dir //this var it's used to know if the pipe is bent or not
P.initialize_directions_he = pipe_dir
//var/turf/T = P.loc
//P.level = T.intact ? 2 : 1
@@ -516,7 +516,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
usr << "There's nothing to connect this manifold to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
usr << pipefailtext
return 1
M.build_network()
if (M.node1)
@@ -539,7 +539,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
usr << pipefailtext
return 1
M.build_network()
if (M.node1)
@@ -562,7 +562,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
usr << pipefailtext
return 1
M.build_network()
if (M.node1)
@@ -585,7 +585,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
usr << "There's nothing to connect this manifold to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
usr << pipefailtext
return 1
M.build_network()
if (M.node1)
@@ -612,7 +612,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
usr << pipefailtext
return 1
M.build_network()
if (M.node1)
@@ -639,7 +639,7 @@ Buildable meters
M.level = T.intact ? 2 : 1
M.initialize()
if (!M)
usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
usr << pipefailtext
return 1
M.build_network()
if (M.node1)
+6 -7
View File
@@ -32,7 +32,7 @@
for(var/atom/movable/O in src)
O.loc = src.loc
del(src)
qdel(src)
/obj/effect/anomaly/attackby(obj/item/I, mob/user)
@@ -85,7 +85,7 @@
/obj/effect/anomaly/flux/New()
..()
aSignal.origin_tech = "powerstorage=5;programming=3;plasmatech=2"
aSignal.origin_tech = "powerstorage=6;programming=4;plasmatech=4"
/////////////////////
@@ -97,7 +97,7 @@
/obj/effect/anomaly/bluespace/New()
..()
aSignal.origin_tech = "bluespace=5;magnets=3;powerstorage=2"
aSignal.origin_tech = "bluespace=5;magnets=5;powerstorage=3"
/obj/effect/anomaly/bluespace/Bumped(atom/A)
if(isliving(A))
@@ -112,7 +112,7 @@
/obj/effect/anomaly/pyro/New()
..()
aSignal.origin_tech = "plasmatech=5;powerstorage=3;biotech=3"
aSignal.origin_tech = "plasmatech=5;powerstorage=4;biotech=6"
/obj/effect/anomaly/pyro/anomalyEffect()
..()
@@ -122,7 +122,6 @@
payload.toxins = 60
T.zone.air.merge(payload)
T.hotspot_expose(1000, CELL_VOLUME)
// T.atmos_spawn_air("fire", 3)
/////////////////////
@@ -133,12 +132,12 @@
/obj/effect/anomaly/bhole/New()
..()
aSignal.origin_tech = "materials=5;combat=4;engineering=3"
aSignal.origin_tech = "materials=5;combat=4;engineering=4"
/obj/effect/anomaly/bhole/anomalyEffect()
..()
if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen
del(src)
qdel(src)
return
grav(rand(0,3), rand(2,3), 50, 25)