diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi index 9a1e895957..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 ddc26a4e24..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 827ed65bcf..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/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/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index d1e3cd8b5f..1c042594b3 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -330,8 +330,8 @@ icon_override = 'icons/mob/custom_w.dmi' icon_state = "darksabre" item_state = "darksabre" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + 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") @@ -339,6 +339,8 @@ /obj/item/storage/belt/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 = "sheathdark" item_state = "sheathdark" storage_slots = 1 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 diff --git a/tgstation.dme b/tgstation.dme index 443d286b4d..3ffeef9100 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2585,12 +2585,10 @@ #include "interface\stylesheet.dm" #include "modular_citadel\cit_medkits.dm" #include "modular_citadel\cit_screenshake.dm" -#include "modular_citadel\cit_turfs.dm" #include "modular_citadel\citadel_ghostrole_spawners.dm" #include "modular_citadel\cydonian_armor.dm" #include "modular_citadel\dresscode_values.dm" #include "modular_citadel\hopefully_temporary_patches.dm" -#include "modular_citadel\simplemob_vore_values.dm" #include "modular_citadel\code\init.dm" #include "modular_citadel\code\__HELPERS\list2list.dm" #include "modular_citadel\code\__HELPERS\lists.dm"