diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index a6061fad..bcb6aedd 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -566,7 +566,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that "nanotrasen officer", "nanotrasen captain", "shadowling" -// "iac_medic" + "iac_medic" ) var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks if (isnull(dresscode)) @@ -1127,14 +1127,15 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.assignment = "Field Operator" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) -/* REMOVED BECAUSE STUCK + if("iac_medic") var/obj/item/clothing/under/rank/medical/iac = new(M) - iac.aband = new /obj/item/clothing/tie/armband/iac(iac) + iac.aband = new /obj/item/clothing/tie/armband/iac_armband(iac) M.equip_to_slot_or_del(iac, slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/iac(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/iac_vest(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/head/beret/iac(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(M), slot_l_ear) @@ -1156,6 +1157,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/device/flash(M), slot_r_store) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/emt(M), slot_back) M.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(M), slot_s_store) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/iac(M.back), slot_in_backpack) var/obj/item/weapon/card/id/silver/W = new(src) W.name = "[M.real_name]'s ID Card" @@ -1165,7 +1167,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.assignment = "IAC Worker" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) -*/ + M.regenerate_icons() log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].") diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 6d66305e..f50942f6 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -76,3 +76,12 @@ armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0) flags_inv = HIDEEARS siemens_coefficient = 0.7 + +/obj/item/clothing/head/helmet/iac + name = "IAC helmet" + desc = "A helmet worn by medical workers of the Interstellar Aid Corps." + icon = 'icons/obj/clothing/iac_uniform.dmi' + item_state = "iac_helmet" + icon_state = "iac_helmet" + armor = list(melee = 50, bullet = 30, laser = 30,energy = 15, bomb = 10, bio = 20, rad = 0) + flags_inv = HIDEEARS|HIDEEYES \ No newline at end of file diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index e3d429dd..829eb4b2 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -83,3 +83,9 @@ /obj/item/clothing/head/surgery/green desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green." icon_state = "surgcap_green" + +/obj/item/clothing/head/beret/iac + name = "IAC beret" + desc = "A beret worn by medical workers of the Interstellar Aid Corps." + icon = 'icons/obj/clothing/iac_uniform.dmi' + icon_state = "iac_beret" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 74b3610e..140324e5 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -396,4 +396,12 @@ else usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." return - usr.update_inv_wear_suit()*/ //so our overlays update \ No newline at end of file + usr.update_inv_wear_suit()*/ //so our overlays update + +/obj/item/clothing/suit/storage/iac_vest + name = "IAC responce vest" + desc = "An high durability vest worn by medical workers of the Interstellar Aid Corps" + icon_state = "iac_bib" + item_state = "iac_bib" + icon = 'icons/obj/clothing/iac_uniform.dmi' + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 20) \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index e52aafbe..0c41fe92 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -146,8 +146,11 @@ /obj/item/clothing/under/rank/medical/iac name = "iac scrubs" desc = "A change of sterile medical scrubs worn by IAC workers. Has minor protection against biohazards." - icon_state = "scrubsblue" - item_state = "scrubsblue" + icon_state = "iac_s" + icon = 'icons/obj/clothing/iac_uniform.dmi' + item_state = "iac" + item_color = "iac" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /* diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d7896b5b..256e1945 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 259c62a9..0437c98b 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 085bc0f1..d7f76233 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/iac_uniform.dmi b/icons/obj/clothing/iac_uniform.dmi new file mode 100644 index 00000000..a36a1163 Binary files /dev/null and b/icons/obj/clothing/iac_uniform.dmi differ