diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi index bda9dcea61..99e63a2524 100644 Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index d6950f4e1e..8ac9feaae7 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 9655829113..4a770d0cbd 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/custom.dmi b/icons/obj/custom.dmi index 8ed3bb4eca..d59ce84fdf 100644 Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ diff --git a/modular_citadel/code/game/objects/items/stunsword.dm b/modular_citadel/code/game/objects/items/stunsword.dm index 3d541bb139..11e37eafa0 100644 --- a/modular_citadel/code/game/objects/items/stunsword.dm +++ b/modular_citadel/code/game/objects/items/stunsword.dm @@ -28,4 +28,6 @@ else to_chat(user,"Remove the powercell first!") //We make this check because the stunsword starts without a battery. else - to_chat(user, " You can't modify [O] with this kit!") \ No newline at end of file + to_chat(user, " You can't modify [O] with this kit!") + + diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 69015b064d..cbafd69f15 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -209,7 +209,7 @@ name = "Puffy Dress" category = slot_wear_suit path = /obj/item/clothing/suit/puffydress - //ckeywhitelist = //Don't know their ckey yet + ckeywhitelist = ("Stallingratt") /datum/gear/labredblack name = "Black and Red Coat" @@ -217,6 +217,18 @@ path = /obj/item/clothing/suit/toggle/labcoat/labredblack ckeywhitelist = list("blakeryan") +/datum/gear/darksabre + name = "Dark Sabre" + category = slot_in_backpack + path = /obj/item/toy/sword/darksabre + ckeywhitelist = list("inferno707") + +datum/gear/darksabresheath + name = "Dark Sabre Sheath" + category = slot_in_backpack + path = /obj/item/storage/belt/sabre/darksabre + ckeywhitelist = list("inferno707") + diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index 8001d71874..74c93859d3 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -322,3 +322,31 @@ H.arousalloss = H.max_arousal / 3 if(prob(5) && H.hallucination < 15) H.hallucination += 10 + +/obj/item/toy/sword/darksabre + name = "Kiara's Sabre" + desc = "This blade looks as dangerous as its owner." + icon = 'icons/obj/custom.dmi' + icon_override = 'icons/mob/custom_w.dmi' + icon_state = "darksabre" + item_state = "darksabre" + lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi' + righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi' + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("attacked", "struck", "hit") + + +/obj/item/storage/belt/sabre/darksabre + name = "Ornate Sheathe" + desc = "An ornate and rather sinister looking sabre sheathe." + icon = 'icons/obj/custom.dmi' + icon_override = 'icons/mob/custom_w.dmi' + icon_state = "darksheath" + item_state = "darksheath" + storage_slots = 1 + rustle_jimmies = FALSE + w_class = WEIGHT_CLASS_BULKY + max_w_class = WEIGHT_CLASS_BULKY + can_hold = list( + /obj/item/toy/sword/darksabre + ) diff --git a/modular_citadel/icons/mob/inhands/stunsword_left.dmi b/modular_citadel/icons/mob/inhands/stunsword_left.dmi index 68adffaa61..0ecc02d31a 100644 Binary files a/modular_citadel/icons/mob/inhands/stunsword_left.dmi and b/modular_citadel/icons/mob/inhands/stunsword_left.dmi differ diff --git a/modular_citadel/icons/mob/inhands/stunsword_right.dmi b/modular_citadel/icons/mob/inhands/stunsword_right.dmi index 57ef58126e..76fa4d57c9 100644 Binary files a/modular_citadel/icons/mob/inhands/stunsword_right.dmi and b/modular_citadel/icons/mob/inhands/stunsword_right.dmi differ