Tigercat2000 519992b5a9 Merge branch 'byond510' ...

Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme

2016-04-01 14:15:44 -07:00

..

DB ban

Stickyban clean-up, add admin bans

2015-09-27 23:58:10 +02:00

permissionverbs

Add SDQL, +PROCCALL, admin updates

2015-09-25 16:54:27 +02:00

verbs

Merge branch 'byond510'

2016-04-01 14:15:44 -07:00

admin_investigate.dm

Wire Investigation

2015-11-03 06:35:51 -05:00

admin_memo.dm

Add in-game stickyban interface

2015-09-27 09:02:58 +02:00

admin_ranks.dm

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

admin_verbs.dm

Merge branch 'byond510'

2016-04-01 14:15:44 -07:00

admin.dm

Merge branch 'byond510'

2016-04-01 14:15:44 -07:00

banappearance.dm

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

banjob.dm

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

buildmode.dm

Makes buildmode quit if you switch to another mob, to prevent tragedy

2016-02-29 08:09:47 -08:00

create_mob.dm

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

create_object.dm

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

create_poll.dm

Turn poll magic strings into defines

2015-10-05 19:25:05 +02:00

create_turf.dm

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

holder2.dm

Adds super stealth Big Brother mode

2016-02-23 03:20:40 -05:00

IsBanned.dm

Makes IsBanned use text2num for CIDs

2016-01-03 11:56:39 -05:00

machine_upgrade.dm

Add SDQL, +PROCCALL, admin updates

2015-09-25 16:54:27 +02:00

NewBan.dm

Player notes update

2015-09-15 05:10:03 +02:00

newbanjob.dm

…

player_panel.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

secrets.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

sql_notes.dm

510: Remove BYGEX completely, remove autoconvert notes

2016-02-28 11:21:30 -08:00

stickyban.dm

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

topic.dm

Merge branch 'byond510'

2016-04-01 14:15:44 -07:00

ToRban.dm

…

watchlist.dm

Notes IRC fix, add rights checks to watchlist/note procs

2015-09-15 19:21:56 +02:00