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

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06: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

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

2016-04-03 18:22:20 -06: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

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

2016-03-29 14:46:06 -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

…

NewBan.dm

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

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

player_panel.dm

Goon-style blob placement

2016-03-09 20:21:19 -05:00

secrets.dm

Removes cap on bomb cap

2016-03-15 03:39:43 -07:00

sql_notes.dm

fixes broken regex

2016-03-11 21:43:32 +11:00

stickyban.dm

Get the code running on 510

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

topic.dm

Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding

2016-02-18 14:03:58 -03:00

watchlist.dm

…