cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
This commit is contained in:
PsiOmegaDelta
2015-12-13 10:15:29 +01:00
parent fd14a90c34 911498fc32
commit f382626075
28 changed files with 391 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/random_map/random_map.dm
+2 -1
View File
@@ -202,5 +202,6 @@ var/global/list/map_count = list()
target_map.map[target_map.get_map_cell(tx+x,ty+y)] = map[current_cell]
handle_post_overlay_on(target_map,tx,ty)
/datum/random_map/proc/handle_post_overlay_on(var/datum/random_map/target_map, var/tx, var/ty)
return
return