Resolved conflicts:

code/modules/mob/mob.dm
This commit is contained in:
ikarrus
2014-06-13 09:04:30 -06:00
83 changed files with 5768 additions and 5291 deletions
+1 -1
View File
@@ -74,7 +74,7 @@
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/det(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head)
@@ -142,7 +142,7 @@
New()
sleep(2)
new /obj/item/clothing/under/det(src)
new /obj/item/clothing/under/rank/det(src)
new /obj/item/clothing/suit/armor/det_suit(src)
new /obj/item/clothing/suit/det_suit(src)
new /obj/item/clothing/gloves/black(src)