cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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/noise/magma.dm
View File

@@ -37,7 +37,7 @@
/datum/random_map/noise/volcanism/get_additional_spawns(var/value, var/turf/T)
if(value>=178)
if(istype(T,/turf/simulated/floor/plating/airless/asteroid))
if(istype(T,/turf/simulated/floor/asteroid))
T.ChangeTurf(/turf/simulated/floor/airless/lava)
else if(istype(T,/turf/simulated/mineral))
var/turf/simulated/mineral/M = T