shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410)

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-15 14:01:54 -05:00
committed by TalkingCactus
parent 74244a3d32
commit c38fa1eaa3
44 changed files with 5022 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/turfs/simulated/floor/mineral_floor.dm
View File

@@ -114,6 +114,9 @@
floor_tile = /obj/item/stack/tile/mineral/plastitanium
icons = list("shuttlefloor4","shuttlefloor4_dam")
/turf/open/floor/mineral/plastitanium/airless
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/mineral/plastitanium/brig
name = "Brig floor"

28
code/game/turfs/simulated/floor/plasteel_floor.dm
View File

@@ -263,34 +263,6 @@
/turf/open/floor/plasteel/loadingarea/dirtydirty
icon_state = "loadingareadirty2"
/turf/open/floor/plasteel/shuttle
icon_state = "shuttlefloor"
floor_tile = /obj/item/stack/tile/mineral/titanium //old shuttle floors so i don't have to change the map paths in this pr
/turf/open/floor/plasteel/shuttle/red
name = "Brig floor"
icon_state = "shuttlefloor4"
floor_tile = /obj/item/stack/tile/mineral/plastitanium
/turf/open/floor/plasteel/shuttle/yellow
icon_state = "shuttlefloor2"
/turf/open/floor/plasteel/shuttle/white
icon_state = "shuttlefloor3"
/turf/open/floor/plasteel/shuttle/purple
icon_state = "shuttlefloor5"
/turf/open/floor/plasteel/airless/shuttle
icon_state = "shuttlefloor"
/turf/open/floor/plasteel/airless/shuttle/red
name = "Brig floor"
icon_state = "shuttlefloor4"
/turf/open/floor/plasteel/airless/shuttle/yellow
icon_state = "shuttlefloor2"
/turf/open/floor/plasteel/airless/shuttle/white
icon_state = "shuttlefloor3"
/turf/open/floor/plasteel/airless/shuttle/purple
icon_state = "shuttlefloor5"
/turf/open/floor/plasteel/asteroid
icon_state = "asteroidfloor"
/turf/open/floor/plasteel/airless/asteroid

14
code/game/turfs/simulated/wall/mineral_walls.dm
View File

@@ -212,6 +212,20 @@
. = ..()
T.transform = transform
/turf/closed/wall/mineral/titanium/survival
name = "pod wall"
desc = "An easily-compressable wall used for temporary shelter."
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "smooth"
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod, /obj/structure/shuttle/engine)
/turf/closed/wall/mineral/titanium/survival/nodiagonal
smooth = SMOOTH_MORE
/turf/closed/wall/mineral/titanium/survival/pod
canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
/turf/closed/wall/mineral/plastitanium
name = "wall"
desc = "An evil wall of plasma and titanium."

67
code/game/turfs/simulated/wall/shuttle_walls.dm
View File

@@ -1,67 +0,0 @@
/turf/closed/wall/shuttle
name = "wall"
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall"
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_FALSE
/turf/closed/wall/shuttle/copyTurf(turf/T)
. = ..()
T.transform = transform
/turf/closed/wall/shuttle/survival
name = "pod wall"
desc = "An easily-compressable wall used for temporary shelter."
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "smooth"
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/shuttle/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod, /obj/structure/shuttle/engine)
/turf/closed/wall/shuttle/survival/nodiagonal
smooth = SMOOTH_MORE
/turf/closed/wall/shuttle/survival/pod
canSmoothWith = list(/turf/closed/wall/shuttle/survival, /obj/machinery/door/airlock, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/shuttle, /obj/structure/shuttle/engine)
/turf/closed/wall/shuttle/syndie
icon_state = "wall3"
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
/turf/closed/wall/shuttle/smooth
name = "wall"
icon = 'icons/turf/walls/shuttle_wall.dmi'
icon_state = "shuttle"
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/shuttle/smooth, /obj/structure/window/shuttle, /obj/structure/shuttle, /obj/machinery/door/airlock/glass, /obj/machinery/door/airlock/shuttle)
/turf/closed/wall/shuttle/smooth/nodiagonal
smooth = SMOOTH_MORE
icon_state = "shuttle_nd"
/turf/closed/wall/shuttle/smooth/overspace
icon_state = "overspace"
fixed_underlay = list("space"=1)
//sub-type to be used for interior shuttle walls
//won't get an underlay of the destination turf on shuttle move
/turf/closed/wall/shuttle/interior/copyTurf(turf/T)
if(T.type != type)
T.ChangeTurf(type)
if(underlays.len)
T.underlays = underlays
if(T.icon_state != icon_state)
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
if(color)
T.atom_colours = atom_colours.Copy()
T.update_atom_colour()
if(T.dir != dir)
T.setDir(dir)
T.transform = transform
return T

2
code/modules/mining/mine_items.dm
View File

@@ -297,7 +297,7 @@
icon = 'icons/obj/smooth_structures/pod_window.dmi'
icon_state = "smooth"
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/shuttle/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
canSmoothWith = list(/turf/closed/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
//Door
/obj/machinery/door/airlock/survival_pod