diff --git a/code/game/objects/items/rogueweapons/melee/swords.dm b/code/game/objects/items/rogueweapons/melee/swords.dm index ed10cf4032b..e4814c74bd2 100644 --- a/code/game/objects/items/rogueweapons/melee/swords.dm +++ b/code/game/objects/items/rogueweapons/melee/swords.dm @@ -856,6 +856,33 @@ I.afterchange() update_icon() +/obj/item/rogueweapon/sword/stormbringer + force = 40 + force_wielded = 60 + possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike) + gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike, /datum/intent/sword/chop) + icon_state = "stormbringer" + icon = 'modular_redmoon/icons/weapons/64.dmi' + item_state = "stormbringer" + lefthand_file = 'icons/mob/inhands/weapons/roguebig_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/roguebig_righthand.dmi' + name = "stormbringer" + desc = "This blade strikes with cold and death, holding it you will feel the power capable of subjugating the whole world.." + parrysound = "bladedmedium" + swingsound = BLADEWOOSH_LARGE + pickup_sound = 'sound/foley/equip/swordlarge2.ogg' + bigboy = 1 + wlength = WLENGTH_LONG + gripsprite = TRUE + pixel_y = -16 + pixel_x = -16 + inhand_x_dimension = 64 + inhand_y_dimension = 64 + associated_skill = /datum/skill/combat/swords + throwforce = 15 + thrown_bclass = BCLASS_CUT + accuracy_bonus = 5 //large swords are unwieldy + // BRONZE SWORDS // Design goal: Bronze on par with Iron integrity wise, with low defense. However, it has high penfactor. diff --git a/code/modules/clothing/rogueclothes/cloaks/cloaks.dm b/code/modules/clothing/rogueclothes/cloaks/cloaks.dm index 3245a737a1b..ceba0a975ca 100644 --- a/code/modules/clothing/rogueclothes/cloaks/cloaks.dm +++ b/code/modules/clothing/rogueclothes/cloaks/cloaks.dm @@ -1,7 +1,7 @@ /obj/item/clothing/cloak name = "cloak" icon = 'icons/roguetown/clothing/cloaks.dmi' - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' slot_flags = ITEM_SLOT_CLOAK desc = "Protects you from the weather and your identity from everyone else." edelay_type = 1 @@ -24,7 +24,7 @@ color = null icon_state = "tabard" item_state = "tabard" - mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/detailed/tabards.dmi' alternate_worn_layer = TABARD_LAYER body_parts_covered = CHEST|GROIN boobed = TRUE @@ -317,8 +317,8 @@ alternate_worn_layer = TABARD_LAYER body_parts_covered = CHEST|GROIN boobed = TRUE - mob_overlay_icon = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' - sleeved = 'icons/roguetown/clothing/onmob/detailed/tabards.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/detailed/tabards.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/detailed/tabards.dmi' sleevetype = "shirt" nodismemsleeves = TRUE slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK @@ -602,8 +602,8 @@ alternate_worn_layer = CLOAK_BEHIND_LAYER slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK boobed = TRUE - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' - sleevetype = "shirt" + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' + sleevetype = "shirt" nodismemsleeves = TRUE inhand_mod = TRUE // allowed_sex = list(MALE) @@ -727,7 +727,7 @@ slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK // body_parts_covered = ARMS|CHEST boobed = TRUE - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" nodismemsleeves = TRUE inhand_mod = TRUE @@ -826,7 +826,7 @@ item_state = "cape" alternate_worn_layer = CLOAK_BEHIND_LAYER boobed = TRUE - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" nodismemsleeves = TRUE inhand_mod = FALSE @@ -891,7 +891,7 @@ desc = "" icon_state = "chasuble" body_parts_covered = CHEST|GROIN|ARMS - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" slot_flags = ITEM_SLOT_CLOAK allowed_sex = list(MALE, FEMALE) @@ -918,7 +918,7 @@ desc = "" icon_state = "black_cloak" body_parts_covered = CHEST|GROIN|VITALS|ARMS - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" slot_flags = ITEM_SLOT_CLOAK allowed_sex = list(MALE, FEMALE) @@ -931,7 +931,7 @@ desc = "" icon_state = "heartfelt_cloak" body_parts_covered = CHEST|GROIN|VITALS|ARMS - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" slot_flags = ITEM_SLOT_CLOAK allowed_sex = list(MALE, FEMALE) @@ -947,7 +947,7 @@ slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK // body_parts_covered = ARMS|CHEST boobed = TRUE - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" nodismemsleeves = TRUE inhand_mod = TRUE @@ -1180,7 +1180,7 @@ /////////////////////////// /obj/item/clothing/cloak/templar/astratan - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER boobed = FALSE name = "astratan tabard" @@ -1188,7 +1188,7 @@ icon_state = "astratatabard" /obj/item/clothing/cloak/templar/malummite - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER boobed = FALSE name = "malummite tabard" @@ -1196,7 +1196,7 @@ icon_state = "malumtabard" /obj/item/clothing/cloak/templar/necran - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER boobed = FALSE name = "necran tabard" @@ -1206,7 +1206,7 @@ //Below are a couple tabards from Azure /obj/item/clothing/cloak/templar/pestran - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER boobed = FALSE name = "pestran tabard" @@ -1214,7 +1214,7 @@ icon_state = "pestratabard" /obj/item/clothing/cloak/templar/psydon - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER boobed = FALSE name = "psydon tabard" @@ -1222,7 +1222,7 @@ icon_state = "psydontabard" /obj/item/clothing/cloak/templar/abyssor - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER boobed = FALSE name = "abyssor tabard" @@ -1234,7 +1234,7 @@ desc = "A piece of cloth usually worn to cover the hips and part of the legs." color = null icon_state = "faulds" - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = TABARD_LAYER body_parts_covered = LEGS|GROIN slot_flags = ITEM_SLOT_CLOAK|ITEM_SLOT_PANTS @@ -1310,10 +1310,10 @@ icon = 'icons/roguetown/clothing/cloaks.dmi' icon_state = "shadowcloak" item_state = "shadowcloak" - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' alternate_worn_layer = CLOAK_BEHIND_LAYER slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' nodismemsleeves = TRUE inhand_mod = TRUE toggle_icon_state = FALSE @@ -1337,7 +1337,7 @@ name = "citywatch cape" desc = "" icon = 'icons/roguetown/clothing/licensed-infraredbaron/cloaks.dmi' - mob_overlay_icon = 'icons/roguetown/clothing/licensed-infraredbaron/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/licensed-infraredbaron/onmob/cloaks.dmi' icon_state = "citywatch_cape" item_state = "citywatch_cape" @@ -1358,7 +1358,7 @@ alternate_worn_layer = CLOAK_BEHIND_LAYER slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK boobed = TRUE - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" nodismemsleeves = TRUE detail_tag = "_detail" @@ -1369,9 +1369,9 @@ desc = "A cloak that only the meanest of old crones bother to wear." icon_state = "matroncloak" icon = 'icons/roguetown/clothing/cloaks.dmi' - mob_overlay_icon ='icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon ='modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' body_parts_covered = CHEST|GROIN|VITALS|ARMS - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" slot_flags = ITEM_SLOT_CLOAK nodismemsleeves = TRUE @@ -1386,8 +1386,8 @@ alternate_worn_layer = CLOAK_BEHIND_LAYER slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK allowed_sex = list(MALE, FEMALE) + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' body_parts_covered = CHEST|GROIN|VITALS|ARMS|LEGS - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" nodismemsleeves = TRUE inhand_mod = TRUE @@ -1397,8 +1397,8 @@ desc = "A time honored cloak Valorian design, used by founding clans of the Valorian Lodge" icon_state = "inquisitor_cloak" icon = 'icons/roguetown/clothing/cloaks.dmi' - mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi' - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + mob_overlay_icon = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' /obj/item/clothing/cloak/tribal name = "tribal pelt" @@ -1408,7 +1408,7 @@ slot_flags = ITEM_SLOT_BACK_R|ITEM_SLOT_CLOAK body_parts_covered = CHEST|GROIN|VITALS allowed_sex = list(MALE, FEMALE) - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' nodismemsleeves = TRUE boobed = FALSE sellprice = 10 @@ -1430,7 +1430,7 @@ color = null icon_state = "volfpelt" item_state = "volfpelt" - sleeved = 'icons/roguetown/clothing/onmob/cloaks.dmi' + sleeved = 'modular_redmoon/icons/roguetown/clothing/onmob/cloaks.dmi' sleevetype = "shirt" nodismemsleeves = TRUE inhand_mod = FALSE diff --git a/modular_redmoon/icons/roguetown/clothing/onmob/armor.dmi b/modular_redmoon/icons/roguetown/clothing/onmob/armor.dmi index b424008f93b..fe20da0eefa 100644 Binary files a/modular_redmoon/icons/roguetown/clothing/onmob/armor.dmi and b/modular_redmoon/icons/roguetown/clothing/onmob/armor.dmi differ diff --git a/modular_redmoon/icons/roguetown/clothing/onmob/berserkerhide.dmi b/modular_redmoon/icons/roguetown/clothing/onmob/berserkerhide.dmi new file mode 100644 index 00000000000..1983b811d7c Binary files /dev/null and b/modular_redmoon/icons/roguetown/clothing/onmob/berserkerhide.dmi differ diff --git a/modular_redmoon/icons/roguetown/clothing/onmob/berserkerhideicon.dmi b/modular_redmoon/icons/roguetown/clothing/onmob/berserkerhideicon.dmi new file mode 100644 index 00000000000..57a1e223180 Binary files /dev/null and b/modular_redmoon/icons/roguetown/clothing/onmob/berserkerhideicon.dmi differ diff --git a/modular_redmoon/icons/roguetown/clothing/onmob/shirts.dmi b/modular_redmoon/icons/roguetown/clothing/onmob/shirts.dmi index 426df29eb83..5b5ccc31215 100644 Binary files a/modular_redmoon/icons/roguetown/clothing/onmob/shirts.dmi and b/modular_redmoon/icons/roguetown/clothing/onmob/shirts.dmi differ diff --git a/modular_redmoon/icons/weapons/64.dmi b/modular_redmoon/icons/weapons/64.dmi new file mode 100644 index 00000000000..ec94e6ea755 Binary files /dev/null and b/modular_redmoon/icons/weapons/64.dmi differ diff --git a/roguetown.dme b/roguetown.dme index a7b5138d7c9..468bb96095e 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -9,6 +9,7 @@ // BEGIN_INCLUDE #include "_maps\_basemap.dm" #include "_maps\conflict_marker.dm" +#include "_maps\roguetest.dm" #include "_maps\templates\arcyne_fortress.dm" #include "_maps\templates\bog_shack_small.dm" #include "_maps\templates\sewers.dm"