Merge pull request #25332 from KorPhaeron/turfs2

Jungle Turfs
This commit is contained in:
Cheridan
2017-03-23 02:04:02 -05:00
committed by GitHub
6 changed files with 39 additions and 0 deletions
@@ -0,0 +1,21 @@
/turf/open/floor/plating/dirt
name = "dirt"
desc = "Upon closer examination, it's still dirt."
icon = 'icons/turf/floors.dmi'
icon_state = "dirt"
var/smooth_icon = 'icons/turf/floors/dirt.dmi'
canSmoothWith = list(/turf/closed, /turf/open/floor/plating/dirt)
smooth = SMOOTH_MORE|SMOOTH_BORDER
baseturf = /turf/open/chasm/straight_down/lava_land_surface
initial_gas_mix = "o2=14;n2=23;TEMP=300"
planetary_atmos = TRUE
/turf/open/floor/plating/dirt/Initialize()
pixel_y = -2
pixel_x = -2
icon = smooth_icon
..()
/turf/open/floor/plating/dirt/dark
icon_state = "darkdirt"
smooth_icon = 'icons/turf/floors/darkdirt.dmi'
+16
View File
@@ -0,0 +1,16 @@
/turf/open/water
name = "water"
desc = "Shallow water."
icon = 'icons/turf/floors.dmi'
icon_state = "riverwater"
baseturf = /turf/open/chasm/straight_down/lava_land_surface
initial_gas_mix = "o2=14;n2=23;TEMP=300"
planetary_atmos = TRUE
slowdown = 1
wet = TURF_WET_WATER
/turf/open/water/HandleWet()
if(wet == TURF_WET_WATER)
return
..()
MakeSlippery(TURF_WET_WATER) //rewet after ..() clears out lube/ice etc.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 KiB

After

Width:  |  Height:  |  Size: 429 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

+2
View File
@@ -928,6 +928,7 @@
#include "code\game\turfs\simulated\minerals.dm"
#include "code\game\turfs\simulated\river.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\simulated\water.dm"
#include "code\game\turfs\simulated\floor\fancy_floor.dm"
#include "code\game\turfs\simulated\floor\light_floor.dm"
#include "code\game\turfs\simulated\floor\mineral_floor.dm"
@@ -936,6 +937,7 @@
#include "code\game\turfs\simulated\floor\plating.dm"
#include "code\game\turfs\simulated\floor\reinf_floor.dm"
#include "code\game\turfs\simulated\floor\plating\asteroid.dm"
#include "code\game\turfs\simulated\floor\plating\dirt.dm"
#include "code\game\turfs\simulated\floor\plating\lava.dm"
#include "code\game\turfs\simulated\floor\plating\misc_plating.dm"
#include "code\game\turfs\simulated\wall\mineral_walls.dm"