Fix merge conflict, update virgo planet things

This commit is contained in:
Arokha Sieyes
2018-06-16 10:43:45 -04:00
parent 98b3af60fa
commit 7c050dd35c
7 changed files with 7 additions and 269 deletions

View File

@@ -50,7 +50,7 @@
new /obj/structure/meteorite(current)
var/datum/planet/impacted
for(var/datum/planet/P in planet_controller.planets)
for(var/datum/planet/P in SSplanets.planets)
if(current.z in P.expected_z_levels)
impacted = P
break