cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap

Browse Source 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
This commit is contained in:
Zuhayr
2015-08-22 03:57:12 +09:30
parent 8e0ff6c69f c113cae594
commit b702c81060
625 changed files with 17486 additions and 15293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/random_map/drop/droppod.dm
View File

@@ -12,7 +12,7 @@
preserve_map = 0
wall_type = /turf/simulated/wall/titanium
floor_type = /turf/simulated/floor/engine
floor_type = /turf/simulated/floor/reinforced
var/list/supplied_drop_types = list()
var/door_type = /obj/structure/droppod_door
var/drop_type = /mob/living/simple_animal/parrot

4
code/modules/random_map/drop/droppod_doors.dm
View File

@@ -46,10 +46,10 @@
// Overwrite turfs.
var/turf/origin = get_turf(src)
origin.ChangeTurf(/turf/simulated/floor/engine)
origin.ChangeTurf(/turf/simulated/floor/reinforced)
origin.set_light(0) // Forcing updates
var/turf/T = get_step(origin, src.dir)
T.ChangeTurf(/turf/simulated/floor/engine)
T.ChangeTurf(/turf/simulated/floor/reinforced)
T.set_light(0) // Forcing updates
// Destroy turf contents.