cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 23:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
This commit is contained in:
PsiOmegaDelta
2015-12-13 10:47:33 +01:00
parent 36803747a2 ed49161dd2
commit 12078c48e9
32 changed files with 1706 additions and 1960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/random_map/random_map.dm
View File

@@ -206,5 +206,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