Werner baa9c475c1 Merge branch 'upstream-master' into development-upstream ...

# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm

2017-10-07 15:13:33 +02:00

..

access_control.dm

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

adminhelp.dm

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

adminjump.dm

Remove some world loops (#2965)

2017-07-09 00:24:28 +03:00

adminpm.dm

Admin PM Fix (#2087)

2017-04-14 00:27:55 +03:00

adminsay.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

antag-ooc.dm

aooc for paperwork nerds (#3481)

2017-09-17 02:24:54 +03:00

atmosdebug.dm

Remove a whole bunch of in world loops and rework machinery global lists (#3053)

2017-07-16 20:32:33 +03:00

bluespacetech.dm

Area cleanup, Minor BST tweaks, Nuke Fixes, Explosion fixes (#3164)

2017-07-27 18:10:38 +03:00

BrokenInhands.dm

…

buildmode.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

check_customitem_activity.dm

…

cinematic.dm

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

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

clear_toxins.dm

…

custom_event.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

deadsay.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

debug.dm

Cult and antag fixes/tweaks (#3524)

2017-10-02 22:34:01 -05:00

diagnostics.dm

Removes some in worlds (#3227)

2017-08-06 19:50:53 +03:00

dice.dm

…

getlogs.dm

…

mapping.dm

Remove a whole bunch of in world loops and rework machinery global lists (#3053)

2017-07-16 20:32:33 +03:00

massmodvar.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

modifyvariables.dm

Implements IPIntel, Panic Bunker, and custom access control (#2436)

2017-05-26 13:26:58 +03:00

playsound.dm

Removes some in worlds (#3227)

2017-08-06 19:50:53 +03:00

possess.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

pray.dm

Preferences fixes, ahoy! (#3045)

2017-07-21 20:50:59 +03:00

randomverbs.dm

Implements IPIntel, Panic Bunker, and custom access control (#2436)

2017-05-26 13:26:58 +03:00

SDQL_2_parser.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

SDQL_2.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

SDQL.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

striketeam.dm

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

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

ticklag.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

tripAI.dm

Job subsystem & Player Spawn Tweaks (#2403)

2017-05-23 12:10:30 +03:00

warning.dm

Better SQL prepared statements (#2474)

2017-05-29 21:17:41 +03:00