skull132 22c7748336 Merge branch 'master' into development ...

# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm

2017-05-27 20:11:54 +03:00

..

diseases

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

expansions

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

helper_datums

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

observation

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

radio

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

repositories

Suit Sensors Changes (#2121)

2017-04-23 18:25:39 -04:00

uplink

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

wires

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

ai_law_sets.dm

Merge branch 'development' into map-development

2017-05-01 01:07:56 +03:00

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

api.dm

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

beam.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

browser.dm

Merge voting controller into SSvote (#2183)

2017-05-13 12:37:43 +03:00

callback-usage.txt

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

callback.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

category.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

computerfiles.dm

…

datacore.dm

Fixes #2369 (#2372)

2017-05-21 17:20:22 +03:00

discord_bot.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

disease.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

feedback.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

mind.dm

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

mixed.dm

Fixes #2369 (#2372)

2017-05-21 17:20:22 +03:00

modules.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

server_greeting.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

supplypacks.dm

Merge branch 'development' into map-development

2017-05-01 01:07:56 +03:00