diff --git a/code/datums/outfits/ert/kataphract_ert.dm b/code/datums/outfits/ert/kataphract_ert.dm index 1915e79e077..04e401776f7 100644 --- a/code/datums/outfits/ert/kataphract_ert.dm +++ b/code/datums/outfits/ert/kataphract_ert.dm @@ -4,14 +4,14 @@ uniform = /obj/item/clothing/under/unathi head = /obj/item/clothing/head/helmet/space/void/kataphract suit = /obj/item/clothing/suit/space/void/kataphract - suit_store = /obj/item/tank/oxygen/yellow + suit_store = /obj/item/tank/oxygen/brown belt = /obj/item/melee/energy/sword/hegemony shoes = /obj/item/clothing/shoes/caligae/grey accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/energy/pistol/hegemony = 1) gloves = /obj/item/clothing/gloves/black/unathi id = /obj/item/card/id/distress/kataphract - back = /obj/item/storage/backpack/cultpack/adorned + back = /obj/item/storage/backpack/satchel/hegemony l_ear = /obj/item/device/radio/headset/distress @@ -28,9 +28,9 @@ /datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) - H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") + H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") if(H?.shoes) - var/obj/item/clothing/shoes/magboots/boots = new(H) + var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) /datum/outfit/admin/ert/kataphract/get_id_access() @@ -44,20 +44,10 @@ mask = /obj/item/clothing/mask/breath/vaurca/filter suit = /obj/item/clothing/suit/armor/unathi/klax suit_store = /obj/item/gun/launcher/grenade - belt = /obj/item/melee/energy/sword/hegemony shoes = /obj/item/clothing/shoes/vaurca - accessory = /obj/item/clothing/accessory/holster/thigh - accessory_contents = list(/obj/item/gun/energy/pistol/hegemony = 1) gloves = null - id = /obj/item/card/id/distress/kataphract - back = /obj/item/storage/backpack/cultpack/adorned - - l_ear = /obj/item/device/radio/headset/distress l_hand = /obj/item/martial_manual/vaurca - r_pocket = /obj/item/device/radio - - belt_contents = null backpack_contents = list( /obj/item/handcuffs/ziptie = 2, @@ -73,11 +63,13 @@ var/obj/item/organ/vaurca/preserve/preserve = H.internal_organs_by_name["phoron reserve tank"] H.internals = preserve - var/uniform_colour = pick("#1f8c3c", "#ab7318", "#1846ba") + var/uniform_colour = pick("#42b360", "#b68029", "#5574c2") if(H?.w_uniform) H.w_uniform.color = uniform_colour if(H?.shoes) H.shoes.color = uniform_colour + var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) + H.equip_to_slot_if_possible(boots, slot_shoes) /datum/outfit/admin/ert/kataphract/specialist name = "Kataphract-Hopeful Spec." @@ -104,9 +96,9 @@ /datum/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) - H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") + H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") if(H?.shoes) - var/obj/item/clothing/shoes/magboots/boots = new(H) + var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) /datum/outfit/admin/ert/kataphract/leader @@ -118,7 +110,7 @@ /datum/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) - H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") + H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") if(H?.shoes) - var/obj/item/clothing/shoes/magboots/boots = new(H) + var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 34fc4a817f1..ab17f03e012 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -210,6 +210,16 @@ ..() new /obj/item/storage/wallet/random( src ) +/obj/item/storage/backpack/satchel/hegemony + name = "hegemony satchel" + desc = "A rugged satchel with many pouches, seen commonly within the Hegemony Levies." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "hegemony_satchel" + item_state = "hegemony_satchel" + contained_sprite = TRUE + max_storage_space = 32 + allow_quick_empty = FALSE // Pouches 'n shit. + /obj/item/storage/backpack/satchel_norm name = "satchel" desc = "A trendy looking satchel." diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 277aa21cbb0..37ba5618f2a 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -36,6 +36,9 @@ desc = "A tank of oxygen, this one is red." icon_state = "oxygen_fr" +/obj/item/tank/oxygen/brown + desc = "A tank of oxygen, this one is brown." + icon_state = "oxygen_br" /* * Anesthetic diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 3dfaf8a79b4..0cb07349104 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -94,3 +94,12 @@ if(item_flags & NOSLIP) state = "enabled" to_chat(user, "Its mag-pulse traction system appears to be [state].") + +/obj/item/clothing/shoes/magboots/hegemony + name = "hegemony magboots" + desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear. This variant is frequently seen in the Hegemony Navy." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "hegemony_magboots0" + item_state = "hegemony_magboots" + icon_base = "hegemony_magboots" + contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/geeves - kataphract_satchel.yml b/html/changelogs/geeves - kataphract_satchel.yml new file mode 100644 index 00000000000..b494e9bcf61 --- /dev/null +++ b/html/changelogs/geeves - kataphract_satchel.yml @@ -0,0 +1,9 @@ +author: Geeves and Kyres + +delete-after: True + +changes: + - rscadd: "Gave the Kataphracts a new backpack, the Hegemony Satchel, which has slightly more than normal storage space." + - tweak: "Tweaked the Kataphract oxygen tank and magboots to fit the aesthetic some more." + - tweak: "Tweaked the colours of the underclothes the Kataphracts spawn with to be more easy on the eye." + - rscadd: "Gave the Kataphract Klax a set of magboots." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index de12640df60..185c7e84dc8 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 34987c62f7f..a8fbef6d4a0 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index c1b956645b5..73f21b5dc83 100644 Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 8bcabf37b6e..736f0b148cd 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ