Neerti 5b0b639377 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi ...

# Conflicts resolved:
#	maps/submaps/cave_submaps/cave_areas.dm

2017-11-26 12:09:55 -05:00

..

antagonist

Removes the mosin-nagant, moves the sprites

2017-11-22 01:14:14 -06: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

work

2017-11-26 12:08:05 -05:00

jobs

work

2017-11-26 12:08:05 -05:00

machinery

work

2017-11-26 12:08:05 -05:00

magic

…

mecha

MedHUDs can identify FBPs

2017-10-23 15:09:22 +01:00

objects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi

2017-11-26 12:09:55 -05:00

turfs

work

2017-11-26 12:08:05 -05:00

vehicles

…

verbs

Makes it pink

2017-11-06 19:09:11 -06:00

atoms_movable.dm

Makes Icon Scaling Great

2017-11-14 19:32:49 -05:00

atoms.dm

Adds rings

2017-10-15 15:05:52 -05:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Tweaks Geiger Counters

2017-11-16 18:13:29 -05:00

supplyshuttle.dm

Sell thaler for cargo points!

2017-10-16 18:58:07 +01:00

trader_visit.dm

…