Jack Edge 78100f83ea Merge branch 'master' into turn-both-keys ...

Conflicts:
	tgui/assets/tgui.js

2016-07-08 19:49:12 +01:00

..

DB_ban

adds edit to job tempbans

2016-06-23 23:23:27 +10:00

permissionverbs

…

verbs

Merge branch 'master' into turn-both-keys

2016-07-08 19:49:12 +01:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

Verb for clearing transit

2016-07-02 01:23:49 +01:00

admin.dm

Adds Asteroid emergency shuttle to station (#18125)

2016-06-02 15:48:08 -05: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

Instant Runoff Voting! (#19153)

2016-07-06 16:03:43 +12:00

create_turf.dm

…

fun_balloon.dm

Merge branch 'fun-balloon' into shuttle-processing

2016-06-25 16:26:22 +01:00

holder2.dm

…

ipintel.dm

Makes ipintel only warn, fixes some cache things.

2016-06-17 03:54:42 -07:00

IsBanned.dm

Makes ipintel only warn, fixes some cache things.

2016-06-17 03:54:42 -07:00

NewBan.dm

…

player_panel.dm

Removes shadowling (#18951)

2016-06-27 20:53:35 -04:00

secrets.dm

Refactors weather into a subsystem (#19003)

2016-07-04 13:55:36 +12:00

sql_notes.dm

…

stickyban.dm

…

topic.dm

Notification if admin is already busy answering Centcomm messages/Syndicate Messages/Nuke requests (#19167)

2016-07-07 14:39:19 -04:00

watchlist.dm

…