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

Merge pull request #1606 from SkyMarshal/master

Browse Source 
Some small changes before I go to bed.
This commit is contained in:
Albert Iordache
2012-08-12 01:06:03 -07:00
parent ad4be43ec0 2ed777a53e
commit 3439b6a88f
4 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/TriDimension/Structures.dm
+56 -28
View File
@@ -23,20 +23,34 @@
New()
. = ..()
spawn(1) //Allow map to load
if(!target)
var/list/adjacent_to_me = global_adjacent_z_levels["[z]"]
target = locate() in locate(x,y,adjacent_to_me["down"])
if (istype(target))
icon_state = top_icon_state
else
target = locate() in locate(x,y,adjacent_to_me["up"])
if (istype(target))
icon_state = bottom_icon_state
if(z in levels_3d)
if(!target)
var/list/adjacent_to_me = global_adjacent_z_levels["[z]"]
if("up" in adjacent_to_me)
target = locate() in locate(x,y,adjacent_to_me["up"])
if(istype(target))
icon_state = bottom_icon_state
else if("down" in adjacent_to_me)
target = locate() in locate(x,y,adjacent_to_me["down"])
if(istype(target))
icon_state = top_icon_state
else
del src
else
del src
else if("down" in adjacent_to_me)
target = locate() in locate(x,y,adjacent_to_me["down"])
if(istype(target))
icon_state = bottom_icon_state
else
del src
else
del src
if(target)
target.icon_state = ( icon_state == top_icon_state ? bottom_icon_state : top_icon_state)
target.target = src
if(target)
target.icon_state = ( icon_state == top_icon_state ? bottom_icon_state : top_icon_state)
target.target = src
else
del src
Del()
spawn(1)
@@ -66,7 +80,7 @@
var/top_icon_state_open = "hatchdown-open"
var/top_icon_state_close = "hatchdown-close"
bottom_icon_state = "hatchup"
bottom_icon_state = "ladderup"
var/image/green_overlay
var/image/red_overlay
@@ -127,23 +141,37 @@
New()
. = ..()
spawn(1)
if(!target)
var/list/adjacent_to_me = global_adjacent_z_levels["[z]"]
target = locate() in locate(x,y,adjacent_to_me["up"])
if(istype(target))
icon_state = bottom_icon_state
else
target = locate() in locate(x,y,adjacent_to_me["down"])
if(istype(target))
icon_state = top_icon_state
if(z in levels_3d)
if(!target)
var/list/adjacent_to_me = global_adjacent_z_levels["[z]"]
if("up" in adjacent_to_me)
target = locate() in locate(x,y,adjacent_to_me["up"])
if(istype(target))
icon_state = bottom_icon_state
else if("down" in adjacent_to_me)
target = locate() in locate(x,y,adjacent_to_me["down"])
if(istype(target))
icon_state = top_icon_state
else
del src
else
del src
else if("down" in adjacent_to_me)
target = locate() in locate(x,y,adjacent_to_me["down"])
if(istype(target))
icon_state = bottom_icon_state
else
del src
else
del src
if(target)
target.icon_state = ( icon_state == top_icon_state ? bottom_icon_state : top_icon_state)
target.target = src
var/obj/multiz/stairs/lead_in = locate() in get_step(src, reverse_direction(dir))
if(lead_in)
lead_in.icon_state = ( icon_state == top_icon_state ? bottom_icon_state : top_icon_state)
if(target)
target.icon_state = ( icon_state == top_icon_state ? bottom_icon_state : top_icon_state)
target.target = src
var/obj/multiz/stairs/lead_in = locate() in get_step(src, reverse_direction(dir))
if(lead_in)
lead_in.icon_state = ( icon_state == top_icon_state ? bottom_icon_state : top_icon_state)
else
del src
Del()
code/TriDimension/Turfs.dm
+1 -1
View File
@@ -75,7 +75,7 @@ atom/movable/Move() //Hackish
attackby()
return //nothing
proc/set_up() //Update the overlayss to make the openspace turf show what's down a level
proc/set_up() //Update the overlays to make the openspace turf show what's down a level
if(!overlay_references)
overlay_references = list()
if(!floorbelow) return
code/WorkInProgress/Cael_Aislinn/multiz_pipe.dmi → code/TriDimension/multiz_pipe.dmi
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

code/setup_3d.dm
+2 -2
View File
@@ -7,9 +7,9 @@
#ifdef ZAS_3D
var/list/levels_3d = list(1,4,7) //To expediate calculations, just do "z in levels_3d"
var/list/levels_3d = list(1,2) //To expediate calculations, just do "z in levels_3d"
var/list/global_adjacent_z_levels = list("1" = list("up" = 2, "down" = 7), "2" = list("down" = 1), "7" = list("up" = 1)) //Example. 2 is above 1 which is above 7.
var/list/global_adjacent_z_levels = list("1" = list("up" = 2), "2" = list("down" = 1)) //Example. 2 is above 1
//Commented out ones are incomplete.
//#include "TriDimension\Pipes.dm" //Example