diff --git a/code/game/objects/items/weapons/melee/misc_vr.dm b/code/game/objects/items/weapons/melee/misc_vr.dm new file mode 100644 index 00000000000..fd228ba9c42 --- /dev/null +++ b/code/game/objects/items/weapons/melee/misc_vr.dm @@ -0,0 +1,16 @@ +/obj/item/weapon/melee/rapier + name = "rapier" + desc = "A gleaming steel blade with a gold handguard and inlayed with an outstanding red gem." + icon = 'icons/obj/weapons_vr.dmi' + icon_state = "rapier" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', + ) + force = 15 + throwforce = 10 + w_class = ITEMSIZE_NORMAL + sharp = 1 + edge = 0 + attack_verb = list("stabbed", "lunged at", "dextrously struck", "sliced", "lacerated", "impaled", "diced", "charioted") + hitsound = 'sound/weapons/bladeslice.ogg' \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index af14ca3e30c..3d7e899dc22 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -178,3 +178,19 @@ if(prob(75)) new /obj/item/weapon/storage/backpack/dufflebag/sec(src) return ..() + +/obj/structure/closet/secure_closet/captains + starts_with = list( + /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/clothing/head/helmet, + /obj/item/clothing/suit/storage/vest, + /obj/item/weapon/cartridge/captain, + /obj/item/weapon/storage/lockbox/medal, + /obj/item/device/radio/headset/heads/captain, + /obj/item/device/radio/headset/heads/captain/alt, + /obj/item/weapon/gun/energy/gun, + /obj/item/weapon/melee/telebaton, + /obj/item/device/flash, + /obj/item/weapon/storage/box/ids, + /obj/item/weapon/melee/rapier, + /obj/item/clothing/accessory/holster/machete/rapier) \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/holster_vr.dm b/code/modules/clothing/under/accessories/holster_vr.dm index 75cb4ccc9e7..f99e798faa8 100644 --- a/code/modules/clothing/under/accessories/holster_vr.dm +++ b/code/modules/clothing/under/accessories/holster_vr.dm @@ -1,4 +1,53 @@ /obj/item/clothing/accessory/holster/waist/kinetic_accelerator name = "KA holster" desc = "A specialized holster, made specifically for Kinetic Accelerator." - can_hold = list(/obj/item/weapon/gun/energy/kinetic_accelerator) \ No newline at end of file + can_hold = list(/obj/item/weapon/gun/energy/kinetic_accelerator) + +/obj/item/clothing/accessory/holster/machete/rapier + name = "rapier sheath" + desc = "A beautiful red sheath, probably for a beautiful blade." + icon = 'icons/obj/clothing/ties_vr.dmi' + icon_state = "sheath" + slot_flags = SLOT_BELT|ACCESSORY_SLOT_WEAPON + var/has_full_icon = 1 + icon_override = 'icons/mob/ties_vr.dmi' + overlay_state = "sheath" + can_hold = list(/obj/item/weapon/melee/rapier) + +/obj/item/clothing/accessory/holster/machete/rapier/swords + name = "sword sheath" + desc = "A beautiful red sheath, probably for a beautiful blade." + can_hold = list( + /obj/item/weapon/melee/rapier, + /obj/item/weapon/material/sword/katana, + /obj/item/toy/cultsword, + /obj/item/weapon/material/sword, + /obj/item/weapon/melee/cursedblade, + /obj/item/weapon/melee/cultblade + ) + +/obj/item/clothing/accessory/holster/machete/rapier/proc/occupied() + if(!has_full_icon) + return + if(contents.len) + overlay_state = "[initial(overlay_state)]-rapier" + else + overlay_state = initial(overlay_state) + +/obj/item/clothing/accessory/holster/machete/rapier/swords/occupied() + if(!has_full_icon) + return + if(contents.len) + overlay_state = "[initial(overlay_state)]-secondary" + else + overlay_state = initial(overlay_state) + +/obj/item/clothing/accessory/holster/machete/rapier/holster(var/obj/item/I, var/mob/living/user) + ..() + occupied() + has_suit.update_clothing_icon() + +/obj/item/clothing/accessory/holster/machete/rapier/unholster(var/obj/item/I, var/mob/living/user) + ..() + occupied() + has_suit.update_clothing_icon() diff --git a/icons/mob/items/lefthand_melee_vr.dmi b/icons/mob/items/lefthand_melee_vr.dmi index 69ff6b66108..ad144c53b44 100644 Binary files a/icons/mob/items/lefthand_melee_vr.dmi and b/icons/mob/items/lefthand_melee_vr.dmi differ diff --git a/icons/mob/items/righthand_melee_vr.dmi b/icons/mob/items/righthand_melee_vr.dmi index 655dbc371d6..3d5ca587dbd 100644 Binary files a/icons/mob/items/righthand_melee_vr.dmi and b/icons/mob/items/righthand_melee_vr.dmi differ diff --git a/icons/mob/ties_vr.dmi b/icons/mob/ties_vr.dmi index 7e06a43e112..2b45005380e 100644 Binary files a/icons/mob/ties_vr.dmi and b/icons/mob/ties_vr.dmi differ diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/obj/clothing/ties_vr.dmi index 9df871aedc4..b6ffe4b998b 100644 Binary files a/icons/obj/clothing/ties_vr.dmi and b/icons/obj/clothing/ties_vr.dmi differ diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi index aa67af73261..26cb3ecd2f6 100644 Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 8ef0b551762..8792701170f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1356,6 +1356,7 @@ #include "code\game\objects\items\weapons\melee\energy.dm" #include "code\game\objects\items\weapons\melee\energy_vr.dm" #include "code\game\objects\items\weapons\melee\misc.dm" +#include "code\game\objects\items\weapons\melee\misc_vr.dm" #include "code\game\objects\items\weapons\storage\backpack.dm" #include "code\game\objects\items\weapons\storage\backpack_vr.dm" #include "code\game\objects\items\weapons\storage\bags.dm"