diff --git a/code/datums/storage/subtypes/belts.dm b/code/datums/storage/subtypes/belts.dm index bab1c22eb9e..48c20789f7d 100644 --- a/code/datums/storage/subtypes/belts.dm +++ b/code/datums/storage/subtypes/belts.dm @@ -294,6 +294,16 @@ . = ..() set_holdable(/obj/item/melee/parsnip_sabre) +/datum/storage/gladius_belt + max_slots = 1 + do_rustle = FALSE + max_specific_storage = WEIGHT_CLASS_BULKY + click_alt_open = FALSE + +/datum/storage/gladius_belt/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) + . = ..() + set_holdable(/obj/item/claymore/gladius) + ///Plant belt /datum/storage/plant_belt max_slots = 6 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index e757897d691..2517976d96b 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -546,3 +546,4 @@ if(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK)) final_block_chance = 0 //Don't bring a...mace to a gunfight, and also you aren't going to really block someone full body tackling you with a mace. Or a road roller, if one happened to hit you. return ..() + diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 91240c6534e..57e9b95cef7 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -640,6 +640,15 @@ worn_icon_state = "grass_sheath" storage_type = /datum/storage/green_sabre_belt +/obj/item/storage/belt/sheath/gladius + name = "gladius scabbard" + desc = "A fun-sized sheath for a fun-sized sword." + icon_state = "gladius_sheath" + inhand_icon_state = "gladius_sheath" + worn_icon_state = "gladius_sheath" + storage_type = /datum/storage/gladius_belt + stored_blade = /obj/item/claymore/gladius + /obj/item/storage/belt/plant name = "botanical belt" desc = "A sturdy leather belt used to hold most hydroponics supplies." diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 63ee92212ec..2a24a234523 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -363,6 +363,25 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/highlander/robot/process() loc.layer = ABOVE_ALL_MOB_LAYER +/obj/item/claymore/gladius + name = "gladius" + desc = "A short but formidable sword, favored by recently-reanimated ancient warriors." + icon = 'icons/obj/weapons/sword.dmi' + icon_state = "gladius" + inhand_icon_state = "gladius" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + sharpness = SHARP_POINTY + attack_verb_continuous = list("stabs", "cuts") + attack_verb_simple = list("stab", "cut") + slot_flags = null + sound_vary = TRUE + block_sound = 'sound/items/weapons/parry.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' + pickup_sound = SFX_KNIFE_PICKUP + drop_sound = SFX_KNIFE_DROP + + /obj/item/katana name = "katana" desc = "Woefully underpowered in D20." diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 4d90d4aa53b..6f6b87c5e17 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -304,7 +304,7 @@ uniform = /obj/item/clothing/under/costume/roman shoes = /obj/item/clothing/shoes/roman back = /obj/item/spear - r_hand = /obj/item/claymore + belt = /obj/item/storage/belt/sheath/gladius l_hand = /obj/item/shield/roman /datum/outfit/roman/pre_equip(mob/living/carbon/human/H, visuals_only) diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index b1d374ae7a7..bb070ab3bfe 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/inhands/equipment/belt_lefthand.dmi b/icons/mob/inhands/equipment/belt_lefthand.dmi index e4f8d4bd397..7675b73543b 100644 Binary files a/icons/mob/inhands/equipment/belt_lefthand.dmi and b/icons/mob/inhands/equipment/belt_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/belt_righthand.dmi b/icons/mob/inhands/equipment/belt_righthand.dmi index 248776ad593..c1cb44abf4a 100644 Binary files a/icons/mob/inhands/equipment/belt_righthand.dmi and b/icons/mob/inhands/equipment/belt_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 3e31f271857..80caa9fbe0d 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 58884a25e54..c12453fca76 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 6e9c45ff112..39e8daa9742 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/weapons/sword.dmi b/icons/obj/weapons/sword.dmi index ae2fdfabede..bd71b4a73c0 100644 Binary files a/icons/obj/weapons/sword.dmi and b/icons/obj/weapons/sword.dmi differ