Jordie0608 0d67f24e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed ...

Conflicts:
	_maps/map_files/DiscStation/DiscStation.dmm

2015-10-23 01:01:02 +11:00

..

DB ban

…

permissionverbs

…

verbs

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

2015-10-23 01:01:02 +11:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

Merge pull request #12186 from MrStonedOne/patch-46

2015-10-10 03:16:05 +03:00

admin.dm

Royal Xeno Expansion

2015-09-29 18:58:40 -05:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_poll.dm

fixes adminonly evaluating as true always

2015-10-08 18:09:43 +11:00

create_turf.dm

…

holder2.dm

…

IsBanned.dm

…

NewBan.dm

…

newbanjob.dm

…

player_panel.dm

Fixes some admin buttons in certain admin messages ("move ferry" in the ferry request message, "adminmoreinfo", "antagonist" (to check antagonist) in player panel, 'list_signalers' button in transfer valve opening message).

2015-10-12 02:03:31 +02:00

secrets.dm

Removes in world

2015-10-09 22:37:53 -05:00

sql_notes.dm

allows adding notes and watchlist for unknown ckeys

2015-10-18 20:48:13 +11:00

stickyban.dm

…

topic.dm

Removes commented out code

2015-10-19 21:15:35 -07:00

watchlist.dm

allows adding notes and watchlist for unknown ckeys

2015-10-18 20:48:13 +11:00