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

..

callproc

UDP Logging (#1997)

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

DB ban

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

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

permissionverbs

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

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

secrets

Merge branch 'master' into development

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

verbs

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

2017-05-26 13:26:58 +03: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

Event tweaks, misc changes and fixes pack (#1588)

2017-01-20 19:23:04 +02:00

admin_secrets.dm

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

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

admin_server_greeting.dm

Welcome Screen (#535)

2016-07-11 16:48:58 +03:00

admin_verbs.dm

Letting skull touch logging is now strictly haram (#2476)

2017-05-27 18:56:22 +03:00

admin.dm

Merge branch 'master' into development

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

banjob.dm

Feature - Rewriting jobbans! (#2114)

2017-05-24 20:46:07 +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

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

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

map_capture.dm

…

NewBan.dm

Feature - Rewriting jobbans! (#2114)

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

player_notes_sql.dm

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

2017-05-21 12:07:57 +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

Merge branch 'master' into development

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

ToRban.dm

…