duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos ...

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

2016-01-13 20:07:21 -06:00

..

DB ban

Removes extra line

2015-11-07 14:59:18 -08:00

permissionverbs

…

verbs

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

2016-01-13 20:07:21 -06:00

admin_investigate.dm

removes ntsl investigate

2015-10-31 15:06:49 +11:00

admin_memo.dm

…

admin_ranks.dm

Removes a bunch of sleep(-1) and spawn(-1) from the code

2016-01-04 15:17:12 -08:00

admin_verbs.dm

Fix indentation

2016-01-12 03:21:18 -02:00

admin.dm

Names

2015-12-31 15:04:05 -06:00

banappearance.dm

…

banjob.dm

Fixes jobban_isbanned() runtime

2015-11-29 17:31:19 -03:00

create_mob.dm

Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after.

2015-09-14 00:58:25 +02:00

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

Removes a bunch of sleep(-1) and spawn(-1) from the code

2016-01-04 15:17:12 -08:00

IsBanned.dm

Computer ID is a string, Thanks byond.

2015-12-11 18:08:19 +00:00

NewBan.dm

…

player_panel.dm

Makes attacks also log to the mob's mind.dm

2016-01-02 17:20:19 -08:00

secrets.dm

Weather datums

2015-12-22 05:31:46 -06:00

sql_notes.dm

allows adding notes and watchlist for unknown ckeys

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

stickyban.dm

Makes the stickyban panel sort the bans by ckey

2015-09-27 20:44:10 -07:00

topic.dm

Fix Check Antagonist button not logging when accessed by player panel

2016-01-10 04:05:24 -02:00

watchlist.dm

allows adding notes and watchlist for unknown ckeys

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