Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence ...

Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi

2015-10-07 22:24:53 +01:00

..

DB ban

Fixes proc arguments

2015-07-15 23:52:35 +02:00

permissionverbs

Fixes proc arguments

2015-07-15 23:52:35 +02:00

verbs

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

2015-10-07 22:24:53 +01:00

admin_investigate.dm

interface for watchlist, improvements to memo, varedit, ban interfaces

2015-08-27 20:57:01 +10:00

admin_memo.dm

interface for watchlist, improvements to memo, varedit, ban interfaces

2015-08-27 20:57:01 +10:00

admin_ranks.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

admin_verbs.dm

Merge pull request #12089 from MrStonedOne/maprotation

2015-10-07 07:53:42 +03:00

admin.dm

Royal Xeno Expansion

2015-09-29 18:58:40 -05:00

banappearance.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

banjob.dm

see jobban reasons from char setup

2015-09-07 20:44:08 +10: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

Added /obj/item/device to spawn panel

2015-08-15 13:52:45 +03:00

create_poll.dm

unmagics polltypes into defines

2015-10-05 17:44:37 +11:00

create_turf.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holder2.dm

Change many ERROR() calls into thrown exceptions

2015-07-23 08:19:08 -07:00

IsBanned.dm

Adds missing closing span tags to admin ban bypass notices.

2015-09-27 17:50:18 -07:00

NewBan.dm

database notes

2015-08-15 22:24:24 +10:00

newbanjob.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

player_panel.dm

database notes

2015-08-15 22:24:24 +10:00

secrets.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

sql_notes.dm

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

2015-08-30 22:55:53 +10:00

stickyban.dm

Makes the stickyban panel sort the bans by ckey

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

topic.dm

removes admin announce from follow.

2015-10-05 20:48:07 -07:00

watchlist.dm

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

2015-08-30 22:55:53 +10:00