bgobandit eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb ...

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2016-05-15 17:19:14 -04:00

..

DB ban

…

permissionverbs

…

verbs

Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

2016-05-15 17:19:14 -04:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

Alternate escape shuttles and ferries (#16761)

2016-05-07 23:35:57 +02:00

admin.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

create_object.dm

…

create_poll.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

…

NewBan.dm

…

player_panel.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

secrets.dm

Adds jump link to the message

2016-05-06 16:10:29 -07:00

sql_notes.dm

…

stickyban.dm

…

topic.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

watchlist.dm

…