Arokha Sieyes f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update ...

# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.

2016-05-15 12:39:30 -04:00

..

admin

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

alarm

…

assembly

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

awaymissions

…

blob

…

client

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -04:00

clothing

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -04:00

customitems

…

detectivework

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

economy

Gives Diona pay the same as Taj and Unathi

2016-05-12 22:24:40 +01:00

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

genetics

…

ghosttrap

…

holodeck

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

hydroponics

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

icon generation

…

library

…

lighting

…

maps

…

materials

Reinforced Walls

2016-04-15 16:41:33 +02:00

mining

Adds anti-tamper to crates and adds anti-tamper 1 to abandoned ones.

2016-05-12 14:14:01 -04:00

mob

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -04:00

multiz

…

nano

Merge pull request #1455 from Yoshax/gendertweak

2016-05-05 10:18:25 -04:00

organs

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -04:00

overmap

…

paperwork

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

power

Made slimes more interesting.

2016-05-06 04:07:52 +09:30

projectiles

Updates flashbangs and flash/flare rounds to take advantage of new lighting.

2016-05-12 16:21:39 +01:00

random_map

…

reagents

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

2016-05-15 12:39:30 -04:00

recycling

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

research

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

supermatter

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

surgery

Brain damage no longer prevents implant removal surgery

2016-05-13 02:01:46 +01:00

tables

…

vehicles

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

virus2

…

vore

Merge pull request #58 from JoanRisu/master

2016-05-14 19:46:47 -04:00

xgm

…