phil235 5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1 ...

Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-02-17 00:33:26 +01:00

..

DB ban

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

permissionverbs

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

verbs

Created two new procs to handle reviving mobs more easily:

2016-02-16 23:27:08 +01:00

admin_investigate.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

admin_memo.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

admin_ranks.dm

aaaaaa

2016-02-13 23:05:05 -06:00

admin_verbs.dm

Fix and refactor deadmin/readmin

2016-02-13 13:23:40 -06:00

admin.dm

Fixes spawn_atom() runtime.

2016-02-14 23:49:25 +01:00

banappearance.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

banjob.dm

…

create_mob.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

create_object.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

create_poll.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

create_turf.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

holder2.dm

Fix and refactor deadmin/readmin

2016-02-13 13:23:40 -06:00

IsBanned.dm

Computer ID is a string, Thanks byond.

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

NewBan.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

player_panel.dm

Adds follow links to antags in the check antag panel.

2016-02-11 16:05:27 -08:00

secrets.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

sql_notes.dm

Stub regex.Replace, re-implement SQL note conversion

2016-02-04 17:19:46 -06:00

stickyban.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

topic.dm

Created two new procs to handle reviving mobs more easily:

2016-02-16 23:27:08 +01:00

watchlist.dm

…