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

..

callproc

…

DB ban

Fix SQL

2017-07-20 21:49:03 +03:00

permissionverbs

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

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

secrets

Adds a new admin verb (#3521)

2017-10-01 15:17:55 +02:00

verbs

Merge branch 'upstream-master' into development-upstream

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

view_variables

Merge SSnanoui & Nanomanager (#2427)

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

admin_attack_log.dm

Merge branch 'master' into development

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

admin_investigate.dm

…

admin_ranks.dm

…

admin_secrets.dm

List stuff (#2932)

2017-07-03 12:03:14 +03:00

admin_server_greeting.dm

…

admin_verbs.dm

Merge branch 'upstream-master' into development-upstream

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

admin.dm

Implement mixed secret (#2849)

2017-07-02 02:38:00 +03:00

banjob.dm

Admin & Staff adjustments (#2529)

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

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

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

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

ipintel.dm

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

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

IsBanned.dm

Admin & Staff adjustments (#2529)

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

map_capture.dm

Fixes to getFlatIcon and more. (#3353)

2017-09-19 15:43:01 +03:00

NewBan.dm

Feature - Rewriting jobbans! (#2114)

2017-05-24 20:46:07 +03:00

player_notes_sql.dm

Better SQL prepared statements (#2474)

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

player_notes.dm

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

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

player_panel.dm

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

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

topic.dm

Adds more sounds (#3327)

2017-08-27 16:58:34 -05:00