Merge pull request #738 from Erthilo/master

Adds alternate CMO labcoat, engineering crates need proper access, test code for implant only taser firing, changes to overdose, and more bugfixes
This commit is contained in:
SkyMarshal
2012-03-24 18:04:03 -07:00
23 changed files with 159 additions and 111 deletions
+1 -1
View File
@@ -504,7 +504,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_if_possible(new /obj/item/clothing/under/color/grey(M), M.slot_w_uniform)
M.equip_if_possible(new /obj/item/clothing/suit/space(M), M.slot_wear_suit)
M.equip_if_possible(new /obj/item/clothing/head/helmet/space(M), M.slot_head)
var /obj/item/weapon/tank/jetpack/J = new /obj/item/weapon/tank/jetpack(M)
var /obj/item/weapon/tank/jetpack/oxygen/J = new /obj/item/weapon/tank/jetpack/oxygen(M)
M.equip_if_possible(J, M.slot_back)
J.toggle()
M.equip_if_possible(new /obj/item/clothing/mask/breath(M), M.slot_wear_mask)