Anewbe 25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots ...

# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm

2017-03-02 16:53:29 -06:00

..

admin

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots

2017-03-02 16:53:29 -06:00

alarm

…

assembly

Signaler QoL Improvement - Method to copy setup from one signaler to another

2017-02-05 15:06:28 -05:00

awaymissions

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots

2017-03-02 16:53:29 -06:00

blob

…

client

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots

2017-03-02 16:53:29 -06:00

clothing

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots

2017-03-02 16:53:29 -06:00

customitems

…

detectivework

…

economy

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

error_handler

…

events

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

examine

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

ext_scripts

…

flufftext

…

food

…

gamemaster

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

games

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

genetics

…

ghosttrap

…

holodeck

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

hydroponics

Merge pull request #2929 from Anewbe/taste

2017-01-28 21:06:21 -06:00

icon generation

…

integrated_electronics

Gives not equal gate the correct icon_state

2017-02-27 18:11:38 -05:00

library

…

lighting

…

maps

…

materials

More stuff, finalizes it I hope.

2017-02-20 18:28:31 -05:00

metric

…

mining

QoL on abandoned crate puzzle

2017-02-10 00:14:10 +00:00

mob

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots

2017-03-02 16:53:29 -06:00

multiz

…

nano

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

organs

Fixes blockheadhair tag.

2017-02-25 09:49:24 -05:00

overmap

…

paperwork

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

planet

More stuff, finalizes it I hope.

2017-02-20 18:28:31 -05:00

power

Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system

2017-03-02 16:32:02 -06:00

projectiles

Tasers can hurt simple mobs

2017-02-23 18:24:13 -06:00

random_map

Boots are now a subtype of shoes

2017-02-05 16:17:41 -06:00

reagents

Merge pull request #2989 from MagmaRam/sandwich

2017-02-09 21:24:03 -06:00

recycling

Allows ashtrays to go in the trash.

2016-11-15 19:12:19 -06:00

research

Finally fixes the autolathe/protolate lid animations.

2017-02-24 21:30:57 -05:00

scripting

…

security levels

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

shieldgen

…

shuttles

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

spells

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

supermatter

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

surgery

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

tables

…

vehicles

…

ventcrawl

No longer able to crawl through welded vents.

2016-11-15 20:56:58 -06:00

virus2

…

xenoarcheaology

Fixes a few things, adds changelog.

2017-02-25 10:18:10 -05:00

xenobio2

Xenotaser should work now

2017-01-18 17:47:38 -06:00

xgm

…