Commit Graph

6 Commits

Author SHA1 Message Date
Arokha Sieyes
aaeae6695a Make planets more generic
So that Sif doesn't have to be the only one!
2017-04-14 21:36:48 -04:00
Anewbe
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -06:00
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Neerti
1d9e7c8c08 works on planet stuff 2017-02-06 20:45:21 -05:00