diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index a80dd2c40ac..a795e99c631 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -273,17 +273,7 @@ new /obj/item/clothing/mask/gas/carp(src) new /obj/item/kitchen/knife/hunting(src) new /obj/item/storage/box/papersack/meat(src) - - -/obj/item/storage/box/hero/ronin - name = "Sword Saint, Wandering Vagabond - 1600's." - desc = "Anyone can give up, it's the easiest thing in the world to do. But to hold it together when everyone else would understand if you fell apart, that's true strength. Become the wandering swordsman you were always meant to be!" - -/obj/item/storage/box/hero/ronin/PopulateContents() - new /obj/item/clothing/under/costume/kamishimo - new /obj/item/clothing/head/rice_hat - new /obj/item/katana/weak/curator - new /obj/item/clothing/shoes/sandal(src) + /obj/item/choice_beacon/augments name = "augment beacon" diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index ed591a139aa..1669633b843 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -270,12 +270,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 user.visible_message(span_suicide("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")) return(BRUTELOSS) -/obj/item/katana/weak/curator //This has the same stats as the curator's claymore - desc = "An ancient Katana. Forged by... Well, it doesn't really say, but surely it's authentic! And sharp to boot!" - force = 15 - block_chance = 30 - armour_penetration = 5 - /obj/item/katana/cursed slot_flags = null item_flags = DROPDEL diff --git a/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm b/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm index 6b1e74df703..1012f9c9cd0 100644 --- a/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm +++ b/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm @@ -48,3 +48,13 @@ return revert_cast() to_chat(user, "You are unable to blood crawl!") + +/obj/item/storage/box/hero/ronin + name = "Sword Saint, Wandering Vagabond - 1600's." + desc = "Anyone can give up, it's the easiest thing in the world to do. But to hold it together when everyone else would understand if you fell apart, that's true strength. Become the wandering swordsman you were always meant to be!" + +/obj/item/storage/box/hero/ronin/PopulateContents() + new /obj/item/clothing/under/costume/kamishimo(src) + new /obj/item/clothing/head/rice_hat(src) + new /obj/item/katana/weak/curator(src) + new /obj/item/clothing/shoes/sandal(src) diff --git a/modular_skyrat/modules/moretraitoritems/code/game/objects/items/weaponry.dm b/modular_skyrat/modules/moretraitoritems/code/game/objects/items/weaponry.dm index 3a1d8df9173..466604bce67 100644 --- a/modular_skyrat/modules/moretraitoritems/code/game/objects/items/weaponry.dm +++ b/modular_skyrat/modules/moretraitoritems/code/game/objects/items/weaponry.dm @@ -30,4 +30,8 @@ //I.throw_mode_off(THROW_MODE_TOGGLE) //so they can catch it on the return. //return ..() - +/obj/item/katana/weak/curator //This has the same stats as the curator's claymore + desc = "An ancient Katana. Forged by... Well, it doesn't really say, but surely it's authentic! And sharp to boot!" + force = 15 + block_chance = 30 + armour_penetration = 5