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

Merge branch 'master' into upstream-merge-29940

Browse Source
This commit is contained in:
LetterJay
2017-08-21 23:29:24 -05:00
committed by GitHub
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+1 -1
View File
@@ -72,7 +72,7 @@
layer = EDGED_TURF_LAYER
pixel_x = -32
pixel_y = -32
mouse_opacity = 0
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
opacity = TRUE
/obj/structure/opacity_blocker/singularity_pull()
code/modules/ruins/objects_and_mobs/ruin_mapping_aids.dm
+36 -3
View File
@@ -1,10 +1,10 @@
//These landmarks can be placed in rooms/ruins to set the baseturfs of every turf in the area. Easier than having potentially unlimited subtypes of every turf or having to manually edit the turfs in the map editor
/obj/effect/baseturf_helper
name = "lava baseturf editor"
name = "baseturf editor"
icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon"
var/baseturf = /turf/open/lava/smooth/lava_land_surface
var/baseturf = null
layer = POINT_LAYER
/obj/effect/baseturf_helper/Initialize()
@@ -13,4 +13,37 @@
for(var/turf/T in get_area_turfs(thearea, z))
if(T.baseturf != T.type) //Don't break indestructible walls and the like
T.baseturf = baseturf
qdel(src)
qdel(src)
/obj/effect/baseturf_helper/asteroid
name = "asteroid baseturf editor"
baseturf = /turf/open/floor/plating/asteroid
/obj/effect/baseturf_helper/asteroid/airless
name = "asteroid airless baseturf editor"
baseturf = /turf/open/floor/plating/asteroid/airless
/obj/effect/baseturf_helper/asteroid/basalt
name = "asteroid basalt baseturf editor"
baseturf = /turf/open/floor/plating/asteroid/basalt
/obj/effect/baseturf_helper/asteroid/snow
name = "asteroid snow baseturf editor"
baseturf = /turf/open/floor/plating/asteroid/snow
/obj/effect/baseturf_helper/beach/sand
name = "beach sand baseturf editor"
baseturf = /turf/open/floor/plating/beach/sand
/obj/effect/baseturf_helper/beach/water
name = "water baseturf editor"
baseturf = /turf/open/floor/plating/beach/water
/obj/effect/baseturf_helper/lava
name = "lava baseturf editor"
baseturf = /turf/open/lava/smooth
/obj/effect/baseturf_helper/lava_land/surface
name = "lavaland baseturf editor"
baseturf = /turf/open/lava/smooth/lava_land_surface