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

..

admin

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

alarm

…

assembly

Updates Tools

2017-08-03 04:49:23 -04:00

awaymissions

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

blob

Updates Tools

2017-08-03 04:49:23 -04:00

busy_space

More Morpheus ship names

2017-07-25 19:21:27 -05:00

client

Merge pull request #3699 from Belsima/master

2017-08-16 22:53:00 -04:00

clothing

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

customitems

…

detectivework

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

economy

aliens don't get paid as much

2017-08-11 12:19:28 -04:00

error_handler

…

events

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

examine

work

2017-09-04 21:52:47 -04:00

ext_scripts

…

flufftext

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

food

Changes Spider meat back to Xeno meat

2017-07-17 04:45:40 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

hydroponics

Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use.

2017-09-03 01:46:08 -07:00

icon generation

…

integrated_electronics

Tesla relays will no longer draw power from the local APC when their device's cell is full.

2017-08-20 17:38:39 -05:00

library

Updates Tools

2017-08-03 04:49:23 -04:00

lighting

…

lore_codex

…

maps

…

materials

Merge pull request #3762 from Mechoid/Xeno_Tyranny_Electric_Boogaloo

2017-09-04 18:32:25 -04:00

metric

…

mining

Updates Tools

2017-08-03 04:49:23 -04:00

mob

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

multiz

…

nano

…

organs

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

overmap

…

paperwork

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

planet

…

power

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

projectiles

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

random_map

Fixed the only few instances this gun appears

2017-08-07 23:53:23 -04:00

reagents

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

recycling

work

2017-09-04 21:52:47 -04:00

research

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

scripting

…

security levels

Updates Tools

2017-08-03 04:49:23 -04:00

shieldgen

Updates Tools

2017-08-03 04:49:23 -04:00

shuttles

Makes Arrivals Shuttle Great

2017-08-05 15:18:55 -04:00

spells

It's CentCOM not CentCOMM

2017-07-21 04:29:39 -04:00

supermatter

Ports R-UST from Baystation12 + small admin debug verb

2017-07-19 20:33:16 -04:00

surgery

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

tables

Updates Tools

2017-08-03 04:49:23 -04:00

turbolift

…

vehicles

Updates Tools

2017-08-03 04:49:23 -04:00

ventcrawl

work

2017-09-04 21:52:47 -04:00

virus2

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

xenoarcheaology

Updates Tools

2017-08-03 04:49:23 -04:00

xenobio

work

2017-09-04 21:52:47 -04:00

xenobio2

work

2017-09-04 21:52:47 -04:00

xgm

…