diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index eb72daf923e..29ce1871b79 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -306,25 +306,25 @@ icon_state = "pirate" item_state = "pirate" -/obj/item/clothing/head/piratecaptain +/obj/item/clothing/head/hgpiratecap name = "pirate hat" desc = "Yarr." - icon_state = "pirate" - item_state = "pirate" + icon_state = "hgpiratecap" + item_state = "hgpiratecap" /obj/item/clothing/suit/pirate name = "pirate coat" desc = "Yarr." - icon_state = "hoscap" - item_state = "pirate_cap" + icon_state = "pirate" + item_state = "pirate" flags = FPRINT | TABLEPASS -/obj/item/clothing/suit/piratecaptain +/obj/item/clothing/suit/hgpirate name = "pirate captain coat" desc = "Yarr." - icon_state = "jensencoat" - item_state = "piratecap" + icon_state = "hgpirate" + item_state = "hgpirate" flags = FPRINT | TABLEPASS /obj/item/clothing/glasses/eyepatch diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 2d683a0a087..6d455d3f9fe 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -374,7 +374,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that "tournament janitor", "pirate", "space pirate", - //"soviet soldier", + "soviet admiral", "tunnel clown", "masked killer", "assassin", @@ -683,6 +683,24 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/weapon/staff(M), M.slot_l_hand) M.equip_if_possible(new /obj/item/weapon/storage/backpack(M), M.slot_back) M.equip_if_possible(new /obj/item/weapon/storage/box(M), M.slot_in_backpack) + if("soviet admiral") + M.equip_if_possible(new /obj/item/clothing/head/hgpiratecap(M), M.slot_head) + M.equip_if_possible(new /obj/item/clothing/shoes/combat(M), M.slot_shoes) + M.equip_if_possible(new /obj/item/clothing/gloves/combat(M), M.slot_gloves) + M.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(M), M.slot_ears) + M.equip_if_possible(new /obj/item/clothing/glasses/thermal/eyepatch(M), M.slot_glasses) + M.equip_if_possible(new /obj/item/clothing/suit/hgpirate(M), M.slot_wear_suit) + M.equip_if_possible(new /obj/item/weapon/storage/backpack/bandolier(M), M.slot_back) + M.equip_if_possible(new /obj/item/weapon/gun/projectile/mateba(M), M.slot_belt) + M.equip_if_possible(new /obj/item/clothing/under/soviet(M), M.slot_w_uniform) + var/obj/item/weapon/card/id/W = new(M) + W.name = "[M.real_name]'s ID Card" + W.icon_state = "centcom" + W.access = get_all_accesses() + W.access += get_all_centcom_access() + W.assignment = "Admiral" + W.registered = M.real_name + M.equip_if_possible(W, M.slot_wear_id) M.update_clothing() return diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d137a5f24c0..3f48ce19ff2 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 7194412ab8c..b9c77e369bb 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index fbccced0467..b1c9dec2cbb 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e38a6aa61a0..ce3f177f779 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ