cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-09 23:20:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Aurorastation/development' into Map-Development

Browse Source
This commit is contained in:
LordFowl
2017-01-29 15:38:37 -05:00
parent 426317e156 5a355914fc
commit 865ae1ebd9
218 changed files with 5025 additions and 5528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/random_map/automata/diona.dm
+3 -3
View File
@@ -38,7 +38,7 @@
if(1)
new_growth = 2
var/obj/structure/diona/vines/existing = locate() in T
if(!istype(existing)) existing = PoolOrNew(/obj/structure/diona/vines, T)
if(!istype(existing)) existing = getFromPool(/obj/structure/diona/vines, T)
if(existing.growth < new_growth)
existing.growth = new_growth
existing.update_icon()
@@ -161,11 +161,11 @@
switch(value)
if(ARTIFACT_CHAR)
PoolOrNew(/obj/structure/diona/bulb,T)
getFromPool(/obj/structure/diona/bulb,T)
if(MONSTER_CHAR)
spawn_diona_nymph(T)
if(DOOR_CHAR)
var/obj/structure/diona/vines/V = PoolOrNew(/obj/structure/diona/vines,T)
var/obj/structure/diona/vines/V = getFromPool(/obj/structure/diona/vines,T)
V.growth = 3
V.update_icon()
spawn(1)
code/modules/random_map/drop/droppod_doors.dm
+2 -2
View File
@@ -47,10 +47,10 @@
// Overwrite turfs.
var/turf/origin = get_turf(src)
origin.ChangeTurf(/turf/simulated/floor/reinforced)
origin.set_light(0) // Forcing updates
origin.reconsider_lights() // Forcing updates
var/turf/T = get_step(origin, src.dir)
T.ChangeTurf(/turf/simulated/floor/reinforced)
T.set_light(0) // Forcing updates
T.reconsider_lights() // Forcing updates
// Destroy turf contents.
for(var/obj/O in origin)