Polaris

mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-31 04:22:13 +00:00

Files

Neerti 8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme

2017-09-05 00:58:27 -04:00

devices

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

2017-09-05 00:58:27 -04:00

robot

Converts dialog to use to_chat

2017-08-30 12:40:48 -05:00

stacks

Floor tile, type and carpet change

2017-08-28 23:00:15 -07:00

weapons

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again