MrPerson 6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r ...

Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm

2014-03-21 03:05:39 -07:00

..

DB ban

Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob.

2013-07-16 07:26:51 +02:00

permissionverbs

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00

verbs

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

2014-03-21 03:05:39 -07:00

admin_investigate.dm

Cleaned up the UI and fixed bugs.

2013-11-08 22:54:34 +00:00

admin_memo.dm

…

admin_ranks.dm

Reverting a change I never did?

2013-12-01 23:30:22 +01:00

admin_verbs.dm

Merge pull request #3068 from Aranclanos/Profiles

2014-03-16 12:52:56 -07:00

admin.dm

Merge pull request #2540 from Incoming5643/blobjob

2014-02-03 10:34:31 -08:00

banappearance.dm

Admin bans

2013-04-03 23:28:24 +02:00

banjob.dm

…

create_mob.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-07 22:15:25 -05:00

create_object.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-07 22:15:25 -05:00

create_turf.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-07 22:15:25 -05:00

holder2.dm

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00

IsBanned.dm

Fixes incompabilities of ban DB with Linux system

2014-01-22 23:58:57 +01:00

NewBan.dm

I found #1870 in more places.

2013-12-01 23:18:59 +01:00

newbanjob.dm

Fixed a mistake in newbanjob.dm

2013-12-01 23:26:59 +01:00

player_notes.dm

Removes the "Remove All Notes" options from Player Notes. Ckeys are cleared from the list automatically when the last of their notes are erased.

2013-08-22 16:07:10 -05:00

player_panel.dm

Added the labor shuttle

2013-11-02 15:16:39 -04:00

topic.dm

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

2014-03-21 03:05:39 -07:00