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

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

2015-03-23 16:51:03 +01:00

..

DB ban

Removes extra sql sanitize procs in favor of sanitizeSQL()

2014-10-29 04:12:07 -07:00

permissionverbs

…

verbs

Merge pull request #8354 from MMMiracles/hardsuit_upgrade

2015-03-19 16:45:05 +11:00

admin_investigate.dm

Experimentor Invesigate Take 1

2015-02-20 15:09:59 -06:00

admin_memo.dm

…

admin_ranks.dm

Improves Permission Panel security, take 2

2014-12-28 18:10:07 -03:00

admin_verbs.dm

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00

admin.dm

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00

banappearance.dm

Removes extra sql sanitize procs in favor of sanitizeSQL()

2014-10-29 04:12:07 -07:00

banjob.dm

…

create_mob.dm

Removed commented out regenerate_icons()

2015-03-19 21:35:24 -07:00

create_object.dm

…

create_turf.dm

…

holder2.dm

Merge pull request #6808 from Boggart/readminbugfix

2015-01-10 01:29:01 -03:00

IsBanned.dm

IsBanned() now rejects blank ckeys/ips/cids

2015-03-05 19:35:33 -08:00

NewBan.dm

changed note check to temp

2015-01-25 02:22:28 +11:00

newbanjob.dm

…

player_notes.dm

View Own Notes Readabily Fix

2015-01-25 10:46:27 +01:00

player_panel.dm

More work on slime procs.

2015-03-21 16:37:37 +01:00

topic.dm

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

2015-03-23 16:51:03 +01:00