Neerti 3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance ...

# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm

2016-04-20 05:41:36 -04:00

..

antagonist

Merge pull request #1367 from Neerti/4/5/2016_ambition_tweaks_2

2016-04-08 22:52:48 +01:00

area

Adds a portables pump station to the station.

2016-04-04 04:12:35 -04:00

dna

Construction Update

2016-03-25 16:02:36 -04:00

gamemodes

Merge pull request #1432 from ParadoxSpace/FixesCult

2016-04-17 20:41:05 -04:00

jobs

Fixes Give Random (Head) Job

2016-04-11 16:44:34 +01:00

machinery

Adds a check to the guest pass terminals to help prevent topic manipulation.

2016-04-17 18:00:04 -04:00

magic

…

mecha

Construction Update

2016-03-25 16:02:36 -04:00

objects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

2016-04-20 05:41:36 -04:00

turfs

Adjusts reinforced wall construction

2016-04-04 18:39:02 +01:00

vehicles

…

verbs

Makes it possible to have more than 16 preferences

2016-03-21 18:56:27 +00:00

atoms_movable.dm

…

atoms.dm

…

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Makes it possible to have more than 16 preferences

2016-03-21 18:56:27 +00:00

supplyshuttle.dm

Construction Update

2016-03-25 16:02:36 -04:00