diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 8a69797cccd..f7f78180b0e 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -212,6 +212,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/dualsaber cost = 60 +/datum/uplink_item/dangerous/snakefang + name = "Snakesfang" + desc = "The snakesfang is a fork-tipped scimitar with a sharp edge and sharper bite. This sword cannot fit in your bag, but it does come with a scabbard you can attach to your belt." + reference = "SF" + item = /obj/item/storage/belt/sheath/snakesfang + cost = 25 + /datum/uplink_item/dangerous/powerfist name = "Power Fist" desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply. \ diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 50988d6b5a7..c06f30f57e7 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -234,7 +234,7 @@ /obj/item/stamp, /obj/item/melee/knuckleduster/nanotrasen, /obj/item/melee/rapier, - /obj/item/storage/belt/rapier, + /obj/item/storage/belt/sheath/rapier, /obj/item/nuke_core, /obj/item/nuke_core_container, /obj/item/documents, diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm index 2c7e3e0e346..58cbe324e8e 100644 --- a/code/game/objects/items/weapons/melee/melee_misc.dm +++ b/code/game/objects/items/weapons/melee/melee_misc.dm @@ -45,6 +45,40 @@ AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS) RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy)) +// Traitor Sword +/obj/item/melee/snakesfang + name = "snakesfang" + desc = "A uniquely curved, black and red sword. Extra-edgy and cutting-edge." + lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' + icon_state = "snakesfang" + item_state = "snakesfang" + flags = CONDUCT + force = 25 + throwforce = 10 + w_class = WEIGHT_CLASS_BULKY + sharp = TRUE + origin_tech = "combat=6;syndicate=3" + attack_verb = list("slashed", "sliced", "chopped") + hitsound = 'sound/weapons/bladeslice.ogg' + materials = list(MAT_METAL = 1000) + +/obj/item/melee/snakesfang/Initialize(mapload) + . = ..() + AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS) + +/obj/item/melee/snakesfang/examine_more(mob/user) + . = ..() + . += "A uniquely curved, black and red sword. Extra-edgy and cutting-edge." + . += "" + . += "The MK-IV Enhanced Combat Blade, more colloquially known as the ‘Snakesfang’, is a vicious yet stylish weapon designed \ + by a relatively unknown weapons forge with known ties to the Syndicate. With a wide, curved blade and dual points \ + resembling the fangs of the organization’s serpent motif, the Snakesfang is a statement like no other." + . += "" + . += "While the benefits of its unique design are dubious at best, the Snakesfang is undoubtedly a perilous weapon, with a hardened \ + plastitanium edge that can cause untold harm to a soft target. In the right hands, it can be a terrifying weapon to behold, \ + and it’s said that blood runs down the blade in just the right way, to drip artfully from the twin ‘fangs’ at its apex." + /obj/item/melee/icepick name = "ice pick" desc = "Used for chopping ice. Also excellent for mafia esque murders." diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 24257e07a92..3f6f205721d 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -725,9 +725,9 @@ icon_state = "fannypack_yellow" item_state = "fannypack_yellow" -/obj/item/storage/belt/rapier - name = "rapier sheath" - desc = "Can hold rapiers." +/obj/item/storage/belt/sheath + name = "sword sheath" + desc = "Can hold swords. If you see this, it is a bug. Please report this on GitHub." icon_state = "sheath" item_state = "sheath" storage_slots = 1 @@ -737,11 +737,7 @@ layer_over_suit = TRUE large = TRUE -/obj/item/storage/belt/rapier/populate_contents() - new /obj/item/melee/rapier(src) - update_icon() - -/obj/item/storage/belt/rapier/attack_hand(mob/user) +/obj/item/storage/belt/sheath/attack_hand(mob/user) if(loc != user) return ..() @@ -759,20 +755,20 @@ else to_chat(user, "[src] is empty!") -/obj/item/storage/belt/rapier/handle_item_insertion(obj/item/W, mob/user, prevent_warning) +/obj/item/storage/belt/sheath/handle_item_insertion(obj/item/W, mob/user, prevent_warning) if(!..()) return playsound(src, 'sound/weapons/blade_sheath.ogg', 20) -/obj/item/storage/belt/rapier/remove_from_storage(obj/item/W, atom/new_location) +/obj/item/storage/belt/sheath/remove_from_storage(obj/item/W, atom/new_location) if(!..()) return playsound(src, 'sound/weapons/blade_unsheath.ogg', 20) -/obj/item/storage/belt/rapier/update_icon_state() +/obj/item/storage/belt/sheath/update_icon_state() if(length(contents)) - icon_state = "[icon_state]-rapier" - item_state = "[item_state]-rapier" + icon_state = "[icon_state]-sword" + item_state = "[item_state]-sword" else icon_state = initial(icon_state) item_state = initial(item_state) @@ -780,6 +776,28 @@ var/mob/living/L = loc L.update_inv_belt() +/obj/item/storage/belt/sheath/rapier + name = "rapier sheath" + desc = "Can hold rapiers." + icon_state = "sheath" + item_state = "sheath" + can_hold = list(/obj/item/melee/rapier) + +/obj/item/storage/belt/sheath/rapier/populate_contents() + new /obj/item/melee/rapier(src) + update_appearance(UPDATE_ICON_STATE) + +/obj/item/storage/belt/sheath/snakesfang + name = "snakesfang scabbard" + desc = "Can hold scimitars." + icon_state = "snakesfangsheath" + item_state = "snakesfangsheath" + can_hold = list(/obj/item/melee/snakesfang) + +/obj/item/storage/belt/sheath/snakesfang/populate_contents() + new /obj/item/melee/snakesfang(src) + update_appearance(UPDATE_ICON_STATE) + // ------------------------------------- // Bluespace Belt // ------------------------------------- diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm index 3c6dfde5b38..93d37f5f1fa 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm @@ -14,7 +14,7 @@ new /obj/item/storage/bag/garment/captain(src) new /obj/item/cartridge/captain(src) new /obj/item/radio/headset/heads/captain/alt(src) - new /obj/item/storage/belt/rapier(src) + new /obj/item/storage/belt/sheath/rapier(src) new /obj/item/gun/energy/gun(src) new /obj/item/flash(src) new /obj/item/door_remote/captain(src) diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index cdbe14fd256..9272241406f 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/inhands/weapons_lefthand.dmi b/icons/mob/inhands/weapons_lefthand.dmi index 6815485c27b..64a2bd06532 100644 Binary files a/icons/mob/inhands/weapons_lefthand.dmi and b/icons/mob/inhands/weapons_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons_righthand.dmi b/icons/mob/inhands/weapons_righthand.dmi index 612365aed42..0f1bce7849c 100644 Binary files a/icons/mob/inhands/weapons_righthand.dmi and b/icons/mob/inhands/weapons_righthand.dmi differ diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi index 54a953367e2..82504547e83 100644 Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index bc5888cb9e1..b1441ffca92 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/weapons/melee.dmi b/icons/obj/weapons/melee.dmi index 041abdf6318..1c7db290f2c 100644 Binary files a/icons/obj/weapons/melee.dmi and b/icons/obj/weapons/melee.dmi differ