CaelAislinn 03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

2012-02-10 09:11:08 +10:00

..

verbs

job titles

2012-02-08 20:43:04 -05:00

admin_verbs.dm

added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)

2012-02-08 11:47:07 +10:00

admin.dm

job titles

2012-02-08 20:43:04 -05:00

banjob.dm

Few runtime fixes.

2011-09-29 05:20:33 +00:00

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

NewBan.dm

Some additional logging added for bans, unbans, job bans, and job unbans.

2011-11-02 04:46:37 +00:00

newbanjob.dm

Some additional logging added for bans, unbans, job bans, and job unbans.

2011-11-02 04:46:37 +00:00