diff --git a/code/datums/outfits/ert/kataphract_ert.dm b/code/datums/outfits/ert/kataphract_ert.dm index 9a6b6164e92..1915e79e077 100644 --- a/code/datums/outfits/ert/kataphract_ert.dm +++ b/code/datums/outfits/ert/kataphract_ert.dm @@ -29,10 +29,6 @@ /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") - if(H?.wear_suit) - var/obj/item/clothing/accessory/poncho/big/poncho = new(H) - var/obj/item/clothing/suit/space/void/kataphract/S = H.wear_suit - S.attach_accessory(null, poncho) if(H?.shoes) var/obj/item/clothing/shoes/magboots/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) @@ -86,8 +82,10 @@ /datum/outfit/admin/ert/kataphract/specialist name = "Kataphract-Hopeful Spec." + head = /obj/item/clothing/head/helmet/space/void/kataphract/spec + suit = /obj/item/clothing/suit/space/void/kataphract/spec belt = /obj/item/storage/belt/medical - l_hand = /obj/item/melee/hammer/powered + l_hand = /obj/item/melee/hammer/powered/hegemony belt_contents = list( /obj/item/reagent_containers/hypospray = 1, @@ -107,42 +105,6 @@ /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") - if(H?.wear_suit) - var/obj/item/clothing/accessory/poncho/green/big/poncho = new(H) - var/obj/item/clothing/suit/space/void/kataphract/S = H.wear_suit - S.attach_accessory(null, poncho) - if(H?.shoes) - var/obj/item/clothing/shoes/magboots/boots = new(H) - H.equip_to_slot_if_possible(boots, slot_shoes) - -/datum/outfit/admin/ert/kataphract/specialist - name = "Kataphract-Hopeful Spec." - - belt = /obj/item/storage/belt/medical - l_hand = /obj/item/melee/hammer/powered - - belt_contents = list( - /obj/item/reagent_containers/hypospray = 1, - /obj/item/stack/medical/advanced/bruise_pack = 1, - /obj/item/stack/medical/advanced/ointment = 1, - /obj/item/reagent_containers/glass/bottle/thetamycin = 1 - ) - - backpack_contents = list( - /obj/item/handcuffs/ziptie = 2, - /obj/item/shield/energy/hegemony = 1, - /obj/item/storage/box/donkpockets = 1, - /obj/item/crowbar = 1, - /obj/item/storage/firstaid/adv = 1 - ) - -/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") - if(H?.wear_suit) - var/obj/item/clothing/accessory/poncho/green/big/poncho = new(H) - var/obj/item/clothing/suit/space/void/kataphract/S = H.wear_suit - S.attach_accessory(null, poncho) if(H?.shoes) var/obj/item/clothing/shoes/magboots/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) @@ -150,15 +112,13 @@ /datum/outfit/admin/ert/kataphract/leader name = "Kataphract Knight" + head = /obj/item/clothing/head/helmet/space/void/kataphract/lead + suit = /obj/item/clothing/suit/space/void/kataphract/lead glasses = /obj/item/clothing/glasses/thermal /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") - if(H?.wear_suit) - var/obj/item/clothing/accessory/poncho/red/big/poncho = new(H) - var/obj/item/clothing/suit/space/void/kataphract/S = H.wear_suit - S.attach_accessory(null, poncho) if(H?.shoes) var/obj/item/clothing/shoes/magboots/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/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index c8a3b6276d6..b1e68ae4b4b 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -63,7 +63,7 @@ icon = 'icons/obj/kneehammer.dmi' icon_state = "kneehammer" item_state = "kneehammer" - contained_sprite = 1 + contained_sprite = TRUE slot_flags = SLOT_BELT force = 25 throwforce = 15.0 @@ -83,18 +83,20 @@ item_state = "hammeron" origin_tech = list(TECH_MATERIAL = 5, TECH_ILLEGAL = 2, TECH_COMBAT = 3) var/on = TRUE + var/trigger_chance = 30 + var/reset_time = 30 // reset time in seconds /obj/item/melee/hammer/powered/update_icon() if(on) - icon_state = "hammeron" - item_state = "hammeron" + icon_state = initial(icon_state) + item_state = initial(item_state) else icon_state = "hammeroff" item_state = "hammeroff" -/obj/item/melee/hammer/powered/attack(mob/target as mob, mob/living/user as mob, var/target_zone) +/obj/item/melee/hammer/powered/attack(var/mob/target, var/mob/living/user, var/target_zone) ..() - if(prob(25)) + if(prob(trigger_chance)) if(!on) to_chat(user, "\The [src] buzzes!") return @@ -115,7 +117,7 @@ H.apply_effect(2, WEAKEN) on = FALSE update_icon() - addtimer(CALLBACK(src, .proc/rearm), 45 SECONDS) + addtimer(CALLBACK(src, .proc/rearm), reset_time SECONDS) if(isrobot(user)) var/mob/living/silicon/robot/R = user if(R.cell) @@ -126,6 +128,12 @@ on = TRUE update_icon() +/obj/item/melee/hammer/powered/hegemony + name = "hegemony powered hammer" + desc = "A heavily modified plasteel hammer, it seems to be powered by a robust hydraulic system. This one has the colours of the Izweski Hegemony on it." + icon_state = "hammeron-hegemony" + item_state = "hammeron-hegemony" + trigger_chance = 50 /obj/item/melee/whip name = "whip" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 95bc81db623..92c210765b6 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -200,24 +200,30 @@ /obj/item/clothing/head/helmet/unathi name = "unathi helmet" - desc = "A helmet designated to be worn by an unathi, used commonly by the hegemony levies." + desc = "An outdated helmet designated to be worn by an Unathi, it was commonly used by the Hegemony Levies." icon = 'icons/obj/unathi_items.dmi' icon_state = "unathi_helmet" item_state = "unathi_helmet" - contained_sprite = 1 + contained_sprite = TRUE species_restricted = list("Unathi") armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) siemens_coefficient = 0.35 +/obj/item/clothing/head/helmet/unathi/hegemony + name = "hegemony helmet" + desc = "A highly armored helmet designated to be worn by an Unathi, a newer variant commonly worn by the Hegemony Levies." + icon_state = "hegemony_helmet" + item_state = "hegemony_helmet" + armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40) + /obj/item/clothing/head/helmet/unathi/klax name = "klaxan hopeful helmet" - desc = "A helmet designated to be worn by a K'lax hopeful. The retrofit is only a bit shoddy." + desc = "A helmet designated to be worn by a K'lax hopeful. The retrofit features a modified shape and an extra two eye visors.." icon = 'icons/obj/vaurca_items.dmi' icon_state = "klax_hopeful_helmet" item_state = "klax_hopeful_helmet" - contained_sprite = 1 species_restricted = list("Vaurca") - armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40) siemens_coefficient = 0.35 /obj/item/clothing/head/helmet/tank diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 53ee4f28511..eb9bc89cdc0 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -118,33 +118,7 @@ species_restricted = list("Human") refittable = FALSE -/obj/item/clothing/head/helmet/space/void/kataphract - name = "kataphract voidsuit helmet" - desc = "A tough plated helmet with slits for the eyes, emblazoned paint on the sides indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony." - icon = 'icons/obj/clothing/species/unathi/hats.dmi' - icon_override = 'icons/mob/species/unathi/helmet.dmi' - icon_state = "rig0-kataphract" - item_state = "rig0-kataphract" - armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80) - siemens_coefficient = 0.35 - species_restricted = list("Unathi") - refittable = FALSE - -/obj/item/clothing/suit/space/void/kataphract - name = "kataphract voidsuit" - desc = "A large suit of spaceproof armour, segmented and worked together expertly. Runic tabbard on the front and back indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony." - icon = 'icons/obj/clothing/species/unathi/suits.dmi' - icon_override = 'icons/mob/species/unathi/suit.dmi' - icon_state = "rig-kataphract" - item_state = "rig-kataphract" - slowdown = 1 - w_class = 3 - armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) - siemens_coefficient = 0.35 - species_restricted = list("Unathi") - refittable = FALSE - //Freelancer voidsuit +//Freelancer voidsuit /obj/item/clothing/head/helmet/space/void/freelancer name = "freelancer voidsuit helmet" desc = "An older design of special operations voidsuit helmet utilized by private military corporations." @@ -168,4 +142,55 @@ armor = list(melee = 65, bullet = 55, laser = 20, energy = 15, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 - species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") \ No newline at end of file + species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") + +/obj/item/clothing/head/helmet/space/void/kataphract + name = "kataphract voidsuit helmet" + desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony." + icon = 'icons/obj/clothing/species/unathi/hats.dmi' + icon_override = 'icons/mob/species/unathi/helmet.dmi' + icon_state = "rig0-kataphract" + item_state = "rig0-kataphract" + armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80) + siemens_coefficient = 0.35 + species_restricted = list("Unathi") + refittable = FALSE + +/obj/item/clothing/suit/space/void/kataphract + name = "kataphract voidsuit" + desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony." + icon = 'icons/obj/clothing/species/unathi/suits.dmi' + icon_override = 'icons/mob/species/unathi/suit.dmi' + icon_state = "rig-kataphract" + item_state = "rig-kataphract" + slowdown = 1 + w_class = 3 + armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80) + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.35 + species_restricted = list("Unathi") + refittable = FALSE + +/obj/item/clothing/head/helmet/space/void/kataphract/spec + name = "kataphract specialist voidsuit helmet" + desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Specialist." + icon_state = "rig0-kataphract-spec" + item_state = "rig0-kataphract-spec" + +/obj/item/clothing/suit/space/void/kataphract/spec + name = "kataphract specialist voidsuit" + desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Specialist." + icon_state = "rig-kataphract-spec" + item_state = "rig-kataphract-spec" + +/obj/item/clothing/head/helmet/space/void/kataphract/lead + name = "kataphract knight voidsuit helmet" + desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight." + icon_state = "rig0-kataphract-lead" + item_state = "rig0-kataphract-lead" + +/obj/item/clothing/suit/space/void/kataphract/lead + name = "kataphract knight voidsuit" + desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight." + icon_state = "rig-kataphract-lead" + item_state = "rig-kataphract-lead" \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index bf6a38a8c1e..232f08f342c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -511,7 +511,7 @@ /obj/item/clothing/suit/armor/unathi name = "unathi body armor" - desc = "An armored chestplate designated to be worn by an unathi, used commonly by the hegemony levies." + desc = "An outdated armored chestplate designated to be worn by an Unathi, it was commonly used by the Hegemony Levies." icon = 'icons/obj/unathi_items.dmi' icon_state = "unathi_armor" item_state = "unathi_armor" @@ -520,6 +520,13 @@ armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) siemens_coefficient = 0.35 +/obj/item/clothing/suit/armor/unathi/hegemony + name = "hegemony body armor" + desc = "A highly armored chestplate designated to be worn by an Unathi, a newer variant commonly worn by the Hegemony Levies." + icon_state = "hegemony_armor" + item_state = "hegemony_armor" + armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40) + // Vaurca version of Unathi armour /obj/item/clothing/suit/armor/unathi/klax name = "klaxan hopeful body armor" @@ -530,7 +537,7 @@ contained_sprite = TRUE species_restricted = list("Vaurca") allowed = list(/obj/item/gun/projectile, /obj/item/gun/energy, /obj/item/gun/launcher, /obj/item/melee, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/device/flashlight) - armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40) siemens_coefficient = 0.35 /obj/item/clothing/suit/storage/vest/legion diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index 6674d0f0256..d51369ad2cd 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -56,15 +56,15 @@ has_down_and_sleeves = FALSE // Turns out normal rolling was pretty shoddy, so I made my own for 'Nathi - geeves -/obj/item/clothing/under/unathi/rollsuit(mob/user) +/obj/item/clothing/under/unathi/rollsuit() set name = "Roll Down Jumpsuit" set category = "Object" set src in usr - if(use_check_and_message(user)) + if(use_check_and_message(usr)) return if(has_down_and_sleeves == FALSE) - to_chat(user, span("notice", "You cannot roll down the [src]!")) + to_chat(usr, span("notice", "You cannot roll down the [src]!")) return if((rolled_sleeves == TRUE) && !(rolled_down)) @@ -73,38 +73,38 @@ if(rolled_down) body_parts_covered = initial(body_parts_covered) item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow. - to_chat(user, span("notice", "You roll up your [src].")) + to_chat(usr, span("notice", "You roll up your [src].")) rolled_down = FALSE else body_parts_covered &= LOWER_TORSO|LEGS|FEET item_state = "[initial(item_state)]_d" - to_chat(user, span("notice", "You roll down your [src].")) + to_chat(usr, span("notice", "You roll down your [src].")) rolled_down = TRUE update_clothing_icon() -/obj/item/clothing/under/unathi/rollsleeves(mob/user) +/obj/item/clothing/under/unathi/rollsleeves() set name = "Roll Up Sleeves" set category = "Object" set src in usr - if(use_check_and_message(user)) + if(use_check_and_message(usr)) return if(has_down_and_sleeves == FALSE) - to_chat(user, span("notice", "You cannot roll up your [src]'s sleeves!")) + to_chat(usr, span("notice", "You cannot roll up your [src]'s sleeves!")) return if(rolled_down == TRUE) - to_chat(user, span("notice", "You must roll up your [src] first!")) + to_chat(usr, span("notice", "You must roll up your [src] first!")) return if(rolled_sleeves) body_parts_covered = initial(body_parts_covered) item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow. - to_chat(user, span("notice", "You roll up your [src]'s sleeves.")) + to_chat(usr, span("notice", "You roll down your [src]'s sleeves.")) rolled_sleeves = FALSE else body_parts_covered &= ~(ARMS|HANDS) item_state = "[initial(item_state)]_r" - to_chat(user, span("notice", "You roll down your [src]'s sleeves.")) + to_chat(usr, span("notice", "You roll up your [src]'s sleeves.")) rolled_sleeves = TRUE update_clothing_icon() \ No newline at end of file diff --git a/html/changelogs/geeves - unathiarmoursprites.yml b/html/changelogs/geeves - unathiarmoursprites.yml new file mode 100644 index 00000000000..2254b5e740f --- /dev/null +++ b/html/changelogs/geeves - unathiarmoursprites.yml @@ -0,0 +1,14 @@ +author: Code by Geeves, Sprites by Kyres + +delete-after: True + +changes: + - bugfix: "Fixed the powered hammer's sprites being duplicated instead of mirrored across hands, increased its chance to trigger by 5% (30%)." + - rscadd: "Added a Hegemony version of the powered hammer with orange lights and a 50% chance to trigger." + - tweak: "Made the powered hammer reset in 30 seconds instead of 45." + - rscadd: "Kataphracts now have new voidsuits, no longer will they wear knight armour with ponchos." + - rscadd: "Added new Unathi non-spaceproof body armour, which is ICly a new update to the old leather looking bodyarmour." + - rscadd: "K'lax kataphracts share the abovementioned body armour, but now have special modified helmets for all four their eyes." + - tweak: "Buffed the K'lax helmet ever so slightly, to be on par with the new Unathi body armour." + - bugfix: "Fixed the Jixizi dress to be back to its former beautiful glory." + - bugfix: "Fixed Sinta Jumpsuits allowing you to roll down people's jumpsuits and sleeves from range." diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 783d7a6d4c1..3875f97a5a0 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 8a3da5d94a8..6b021753d7d 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi index f4214722613..3f117ad5f2c 100644 Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi index f99b0d25713..67b54777b70 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ diff --git a/icons/obj/kneehammer.dmi b/icons/obj/kneehammer.dmi index 46366995633..a09294ac364 100644 Binary files a/icons/obj/kneehammer.dmi and b/icons/obj/kneehammer.dmi differ diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 72beb447d37..8bcabf37b6e 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ diff --git a/icons/obj/vaurca_items.dmi b/icons/obj/vaurca_items.dmi index 64e935551a7..e245d520513 100644 Binary files a/icons/obj/vaurca_items.dmi and b/icons/obj/vaurca_items.dmi differ