-Changed turf creations, merging everything to only one proc

-Fixes Issue 1085 - Artificers creating turfs with buggy lighting
-Spells now will use the proper proc to create turfs

Due to the amount of files changed, this is just the 'part one'. The merging in turf.dm is not finished, mineral walls and buildmode are still using the old system. The creation of turfs on the game panel is not using the proper procs yet. Stay tuned for this changes, but now, sleep.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5054 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
aranclanos@hotmail.com
2012-11-13 13:39:00 +00:00
parent b81901685e
commit dee7b74a45
20 changed files with 105 additions and 196 deletions

View File

@@ -137,7 +137,7 @@
if(istype(target,/turf/simulated/wall))
if((!istype(target,/turf/simulated/wall/r_wall) && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one
var/turf/simulated/wall/wall = target
wall.ReplaceWithFloor()
wall.ChangeTurf(/turf/simulated/floor)
new /obj/item/stack/sheet/metal(src, flatPlasmaValue)
return 1
else if(istype(target,/atom/movable))

View File

@@ -21,12 +21,12 @@
/turf/simulated/floor/engine/ex_act(severity)
switch(severity)
if(1.0)
ReplaceWithSpace()
ChangeTurf(/turf/space)
del(src)
return
if(2.0)
if (prob(50))
ReplaceWithSpace()
ChangeTurf(/turf/space)
del(src)
return
else
@@ -34,7 +34,7 @@
/turf/simulated/floor/engine/blob_act()
if (prob(25))
ReplaceWithSpace()
ChangeTurf(/turf/space)
del(src)
return
return

View File

@@ -289,7 +289,7 @@ var/global/list/uneatable = list(
continue
if(O.invisibility == 101)
src.consume(O)
T.ReplaceWithSpace()
T.ChangeTurf(/turf/space)
gain = 2
src.energy += gain
return
@@ -505,7 +505,7 @@ var/global/list/uneatable = list(
continue
if(O.invisibility == 101)
src.consume(O)
A:ReplaceWithSpace()
A:ChangeTurf(/turf/space)
return
/obj/machinery/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO