SinTwo 0086d61d56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl

2016-07-27 16:11:55 -04:00

..

antagonist

Ensures voices are not selected for auto-antag roles

2016-07-11 04:25:21 +01:00

area

- Adds Serena's Trade Ship along with all the odds and ends required to have it work properly.

2016-07-04 14:07:14 -07:00

dna

Reverts the second mob clean up because of incomplete implementation.

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

gamemodes

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

2016-07-22 23:39:19 -04:00

jobs

Merge pull request #2112 from Anewbe/jobs_age

2016-07-13 18:49:50 -04:00

machinery

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

2016-07-27 16:11:55 -04:00

magic

…

mecha

Oddy Sleeper Change

2016-07-25 04:10:42 -04:00

objects

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

2016-07-27 16:11:55 -04:00

turfs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

2016-07-08 21:00:12 -04:00

vehicles

…

verbs

Ensures advanced who entries arent duplicated for admins

2016-07-11 04:44:08 +01:00

atoms_movable.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

atoms.dm

Does even more work.

2016-06-23 05:21:04 -04:00

base_turf.dm

# This is a combination of 2 commits.

2015-12-16 15:26:38 +10:30

json.dm

…

periodic_news.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00

response_team.dm

Allows admins to call an ERT without the announcement

2016-07-12 19:02:16 -05:00

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

Makes cargo datums and shuttle use fifty stacks for material, removes snowflake amount code and var

2016-07-10 03:49:16 +01:00

trader_visit.dm

The Beruang can now sent to visit the station once per round, with traders gathered, in the same manner as the admin ERT call!

2016-07-08 16:07:34 +01:00