Neerti 1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles ...

# Conflicts resolved:
#	code/modules/busy_space/organizations.dm

2017-10-10 01:19:53 -04:00

..

antagonist

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

area

Adds a metric assload of sounds.

2017-09-10 14:34:43 -04:00

dna

Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines

2017-09-26 19:09:12 -05:00

gamemodes

Makes the boots of speed slower, and boots.

2017-10-01 12:11:16 -05:00

jobs

Merge pull request #4014 from Anewbe/drone_permits

2017-10-04 20:59:29 -04:00

machinery

Fixes the entire cloning_sickness PR

2017-10-01 12:50:06 -05:00

magic

…

mecha

Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's.

2017-09-29 22:10:48 -07:00

objects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles

2017-10-10 01:19:53 -04:00

turfs

Read github PR for details.

2017-10-10 00:48:27 -04:00

vehicles

…

verbs

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00

atoms_movable.dm

Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port

2017-09-11 17:17:23 -04:00

atoms.dm

Redoes how gloves prevent fingerprints

2017-07-31 19:06:22 -05:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Adds a metric assload of sounds.

2017-09-10 14:34:43 -04:00

supplyshuttle.dm

work

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

trader_visit.dm

…