cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
This commit is contained in:
Pete Goodfellow
2014-01-20 19:29:47 +00:00
parent 5222191b73 17ba1e20d6
commit e8ed1a83f7
67 changed files with 403 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/debug.dm
-3
View File
@@ -689,8 +689,6 @@ var/global/list/g_fancy_list_of_safe_types = null
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)
@@ -800,7 +798,6 @@ var/global/list/g_fancy_list_of_safe_types = null
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/clothing/tie/waistcoat(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)
var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(M)
for(var/obj/item/briefcase_item in sec_briefcase)