cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Robert the Engineer Update:

Browse Source 
- De-constructed walls now leave proper floor tiles and remember what kind of floor tile was there before (unless it's totally destroyed).
- Windows standardized (don't ask).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@827 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2011-01-12 01:36:50 +00:00
parent e2d4d5029b
commit 8617c514dd
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turf.dm
+13 -15
View File
@@ -110,28 +110,28 @@
O.hide(0)
/turf/proc/ReplaceWithFloor()
if(!icon_old) icon_old = icon_state
var/turf/simulated/floor/W
var/old_icon = icon_old
var/prior_icon = icon_old
var/old_dir = dir
W = new /turf/simulated/floor( locate(src.x, src.y, src.z) )
var/turf/simulated/floor/W = new /turf/simulated/floor( locate(src.x, src.y, src.z) )
W.dir = old_dir
W.icon_old = old_icon
if(old_icon) W.icon_state = old_icon
if(prior_icon) W.icon_state = prior_icon
else W.icon_state = "floor"
W.opacity = 1
W.sd_SetOpacity(0)
W.levelupdate()
return W
/turf/proc/ReplaceWithEngineFloor()
if(!icon_old) icon_old = icon_state
var/old_icon = icon_old
var/prior_icon = icon_old
var/old_dir = dir
var/turf/simulated/floor/engine/E = new /turf/simulated/floor/engine( locate(src.x, src.y, src.z) )
E.dir = old_dir
E.icon_old = old_icon
if(prior_icon) E.icon_state = prior_icon
else E.icon_state = "engine"
/turf/simulated/Entered(atom/A, atom/OL)
if (istype(A,/mob/living/carbon))
@@ -189,32 +189,30 @@
..()
/turf/proc/ReplaceWithSpace()
if(!icon_old) icon_old = icon_state
var/old_icon = icon_old
var/old_dir = dir
var/turf/space/S = new /turf/space( locate(src.x, src.y, src.z) )
S.dir = old_dir
S.icon_old = old_icon
return S
/turf/proc/ReplaceWithLattice()
if(!icon_old) icon_old = icon_state
var/old_icon = icon_old
var/old_dir = dir
var/turf/space/S = new /turf/space( locate(src.x, src.y, src.z) )
S.dir = old_dir
S.icon_old = old_icon
new /obj/lattice( locate(src.x, src.y, src.z) )
return S
/turf/proc/ReplaceWithWall()
var/old_icon = icon_state
var/turf/simulated/wall/S = new /turf/simulated/wall( locate(src.x, src.y, src.z) )
S.icon_old = old_icon
S.opacity = 0
S.sd_NewOpacity(1)
return S
/turf/proc/ReplaceWithRWall()
var/old_icon = icon_state
var/turf/simulated/wall/r_wall/S = new /turf/simulated/wall/r_wall( locate(src.x, src.y, src.z) )
S.icon_old = old_icon
S.opacity = 0
S.sd_NewOpacity(1)
return S
maps/tgstation.2.0.0.dmm
+5 -5
View File
@@ -4993,7 +4993,7 @@
"bSa" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/centcom/shuttle)
"bSb" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/shuttle)
"bSc" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/shuttle)
"bSd" = (/obj/window/reinforced/southeast,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/shuttle)
"bSd" = (/obj/window/reinforced{dir = 5; health = 1e+007; icon_state = "rwindow"; tag = "icon-rwindow (NORTHEAST)"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/centcom/shuttle)
"bSe" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{tag = "icon-bar"; icon_state = "bar"; dir = 2},/area/centcom/living)
"bSf" = (/obj/table{dir = 10; icon_state = "tabledir"},/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/unsimulated/floor{tag = "icon-bar"; icon_state = "bar"; dir = 2},/area/centcom/living)
"bSg" = (/obj/table{icon_state = "tabledir"; dir = 6},/turf/unsimulated/floor{tag = "icon-bar"; icon_state = "bar"; dir = 2},/area/centcom/living)
@@ -6315,7 +6315,7 @@
"crw" = (/obj/cable{icon_state = "2-8"; d1 = 2; d2 = 8},/turf/simulated/floor/airless,/area/derelict/hallway/primary)
"crx" = (/obj/item/device/prox_sensor,/turf/simulated/floor,/area/derelict/storage/storage_access)
"cry" = (/obj/window/basic{tag = "icon-window (NORTH)"; icon_state = "window"; dir = 1},/turf/space,/area)
"crz" = (/obj/window/basic{tag = "icon-window (SOUTHWEST)"; icon_state = "window"; dir = 10},/turf/simulated/floor/plating/airless,/area)
"crz" = (/obj/window/basic{tag = "icon-window (NORTHEAST)"; icon_state = "window"; dir = 5},/turf/simulated/floor/plating/airless,/area)
"crA" = (/obj/grille,/obj/window/basic{tag = "icon-window (NORTH)"; icon_state = "window"; dir = 1},/turf/space,/area)
"crB" = (/obj/window/basic{tag = "icon-window (NORTH)"; icon_state = "window"; dir = 1},/turf/simulated/floor/plating/airless,/area)
"crC" = (/obj/cable,/obj/machinery/power/apc{dir = 0; name = "Worn-out APC"; pixel_y = -24},/turf/simulated/floor,/area/derelict/arrival)
@@ -6772,7 +6772,7 @@
"cAl" = (/turf/unsimulated/wall{icon = 'beach.dmi'; icon_state = "water"},/area/beach)
"cAm" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/beach)
"cAn" = (/obj/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/beach)
"cAo" = (/turf/unsimulated/wall{icon = 'icons/turf/walls.dmi'; icon_state = "rock"; name = "grass"},/area/planet/clown)
"cAo" = (/turf/unsimulated/wall{icon = 'walls.dmi'; icon_state = "rock"; name = "grass"},/area/planet/clown)
"cAp" = (/turf/unsimulated/wall{icon = 'floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown)
"cAq" = (/turf/simulated/mineral,/area/planet/clown)
"cAr" = (/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown)
@@ -6869,7 +6869,7 @@
"cCe" = (/obj/window/reinforced/east,/turf/simulated/shuttle/floor,/area/shipbuilder/ship1)
"cCf" = (/obj/machinery/shuttle/engine/heater,/obj/window/reinforced/north,/turf/simulated/shuttle/floor,/area/shipbuilder/ship1)
"cCg" = (/obj/window/reinforced/west,/turf/simulated/shuttle/floor,/area/shipbuilder/ship1)
"cCh" = (/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/west{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced/southwest,/turf/simulated/shuttle/floor,/area/shipbuilder/ship3)
"cCh" = (/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/west{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{dir = 5; health = 1e+007; icon_state = "rwindow"; tag = "icon-rwindow (NORTHEAST)"},/turf/simulated/shuttle/floor,/area/shipbuilder/ship3)
"cCi" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "wall_space"},/area/shipbuilder/ship1)
"cCj" = (/obj/machinery/shuttle/engine/propulsion/burst,/turf/space,/area/shipbuilder/ship1)
"cCk" = (/turf/simulated/shuttle/wall{dir = 4; icon_state = "wall_space"},/area/shipbuilder/ship1)
@@ -6887,7 +6887,7 @@
"cCw" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shipbuilder/ship5)
"cCx" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shipbuilder/ship6)
"cCy" = (/turf/simulated/shuttle/wall{icon_state = "wall_space"},/area/shipbuilder/ship3)
"cCz" = (/obj/grille,/obj/window/reinforced/south,/obj/window/reinforced/north,/obj/window/reinforced/southwest,/turf/simulated/shuttle/floor,/area/shipbuilder/ship3)
"cCz" = (/obj/grille,/obj/window/reinforced/south,/obj/window/reinforced/north,/obj/window/reinforced{dir = 5; health = 1e+007; icon_state = "rwindow"; tag = "icon-rwindow (NORTHEAST)"},/turf/simulated/shuttle/floor,/area/shipbuilder/ship3)
"cCA" = (/turf/simulated/shuttle/wall{dir = 4; icon_state = "wall_space"},/area/shipbuilder/ship3)
"cCB" = (/obj/machinery/shuttle/engine/propulsion,/turf/space,/area/shipbuilder/ship4)
"cCC" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shipbuilder/ship5)