Jordie0608 3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration ...

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi

2015-07-01 19:41:00 +10:00

..

DB ban

Changes alot of datum/ to /datum/

2015-05-31 02:40:54 +02:00

permissionverbs

…

verbs

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

2015-07-01 19:41:00 +10:00

admin_investigate.dm

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

admin_memo.dm

critical fix to admin memos

2015-06-24 15:58:41 +10:00

admin_ranks.dm

Changing/adding an admins rank now updates the player's table

2015-04-09 03:19:55 -07:00

admin_verbs.dm

Merge pull request #10202 from nullstation/hi-extended

2015-07-01 05:59:39 +01:00

admin.dm

Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier

2015-06-22 23:36:06 -05:00

banappearance.dm

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

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

banjob.dm

…

create_mob.dm

Removed commented out regenerate_icons()

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

create_object.dm

Added /obj/effect and /obj/item/weapon/gun path to Quick Create Object.

2015-04-12 18:26:24 +01:00

create_turf.dm

…

holder2.dm

Newscaster code big cleanup.

2015-05-19 09:32:46 -03:00

IsBanned.dm

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

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

NewBan.dm

changed note check to temp

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

newbanjob.dm

…

player_notes.dm

Changes alot of datum/ to /datum/

2015-05-31 02:40:54 +02:00

player_panel.dm

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

secrets.dm

Secrets clean up/configurable bomb cap

2015-06-14 09:08:27 -07:00

topic.dm

fixes edit reason and log for follow

2015-06-26 16:13:40 +10:00