diff --git a/code/datums/character_flaw/limbloss.dm b/code/datums/character_flaw/limbloss.dm index a8487dd12..eeb643f7d 100644 --- a/code/datums/character_flaw/limbloss.dm +++ b/code/datums/character_flaw/limbloss.dm @@ -22,7 +22,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - var/obj/item/bodypart/r_arm/rproesthetic/L = new() + var/obj/item/bodypart/r_arm/rprosthetic/L = new() L.attach_limb(H) /datum/charflaw/limbloss/arm_l @@ -35,5 +35,5 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - var/obj/item/bodypart/l_arm/rproesthetic/L = new() + var/obj/item/bodypart/l_arm/rprosthetic/L = new() L.attach_limb(H) diff --git a/code/game/objects/items/rogueitems/prosthetics.dm b/code/game/objects/items/rogueitems/prosthetics.dm new file mode 100644 index 000000000..97b8b9448 --- /dev/null +++ b/code/game/objects/items/rogueitems/prosthetics.dm @@ -0,0 +1,212 @@ +/obj/item/bodypart/proc/prosthetic_attachment(var/mob/living/carbon/human/H, var/mob/user) + if(!ishuman(H)) + return + + if(user.zone_selected != body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm. + to_chat(user, span_warning("[src] isn't the right type for [parse_zone(user.zone_selected)].")) + return -1 + + var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) + if(affecting) + return + + if(user.temporarilyRemoveItemFromInventory(src)) + attach_limb(H) + user.visible_message(span_notice("[user] attaches [src] to [H].")) + return 1 + +/obj/item/bodypart/l_arm/rprosthetic + name = "wooden arm (L)" + desc = "A left arm of wood." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pr_arm" + resistance_flags = FLAMMABLE + obj_flags = CAN_BE_HIT + status = BODYPART_ROBOTIC + brute_reduction = 0 + burn_reduction = 0 + max_damage = 20 + w_class = WEIGHT_CLASS_NORMAL + max_integrity = 300 + sellprice = 20 + fingers = FALSE //can't swing weapons but can pick stuff up and punch + +/obj/item/bodypart/l_arm/rprosthetic/iron + name = "iron arm (L)" + desc = "A left arm of iron." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pri_arm" + prosthetic_prefix = "pri" + brute_reduction = 5 + burn_reduction = 5 + sellprice = 30 + +/obj/item/bodypart/l_arm/rprosthetic/steel + name = "steel arm (L)" + desc = "A left arm of steel." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prs_arm" + prosthetic_prefix = "prs" + brute_reduction = 10 + burn_reduction = 10 + sellprice = 40 + +/obj/item/bodypart/l_arm/rprosthetic/clock + name = "clockwork arm (L)" + desc = "A left arm of cogs and gold." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prc_arm" + prosthetic_prefix = "prc" + fingers = TRUE + sellprice = 50 + +/obj/item/bodypart/l_arm/rprosthetic/attack(mob/living/M, mob/user) + prosthetic_attachment(M, user) + +/obj/item/bodypart/r_arm/rprosthetic + name = "wooden arm (R)" + desc = "A right arm of wood." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pr_arm" + resistance_flags = FLAMMABLE + obj_flags = CAN_BE_HIT + status = BODYPART_ROBOTIC + brute_reduction = 0 + burn_reduction = 0 + max_damage = 20 + w_class = WEIGHT_CLASS_NORMAL + max_integrity = 300 + sellprice = 20 + fingers = FALSE //can't swing weapons but can pick stuff up and punch + +/obj/item/bodypart/r_arm/rprosthetic/iron + name = "iron arm (R)" + desc = "A right arm of iron." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pri_arm" + prosthetic_prefix = "pri" + brute_reduction = 5 + burn_reduction = 5 + sellprice = 30 + +/obj/item/bodypart/r_arm/rprosthetic/steel + name = "steel arm (R)" + desc = "A right arm of steel." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prs_arm" + prosthetic_prefix = "prs" + brute_reduction = 10 + burn_reduction = 10 + sellprice = 40 + +/obj/item/bodypart/r_arm/rprosthetic/clock + name = "clockwork arm (R)" + desc = "A right arm of cogs and gold." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prc_arm" + prosthetic_prefix = "prc" + fingers = TRUE + sellprice = 50 + +/obj/item/bodypart/r_arm/rprosthetic/attack(mob/living/M, mob/user) + prosthetic_attachment(M, user) + +/obj/item/bodypart/l_leg/rprosthetic + name = "peg leg (L)" + desc = "A left leg of wood." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pr_leg" + resistance_flags = FLAMMABLE + obj_flags = CAN_BE_HIT + status = BODYPART_ROBOTIC + brute_reduction = 0 + burn_reduction = 0 + max_damage = 20 + w_class = WEIGHT_CLASS_NORMAL + max_integrity = 300 + sellprice = 20 + organ_slowdown = 1.3 + +/obj/item/bodypart/l_leg/rprosthetic/iron + name = "iron leg (L)" + desc = "A left leg of iron." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pri_leg" + prosthetic_prefix = "pri" + organ_slowdown = 1.2 + brute_reduction = 5 + burn_reduction = 5 + sellprice = 30 + +/obj/item/bodypart/l_leg/rprosthetic/steel + name = "steel leg (L)" + desc = "A left leg of steel." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prs_leg" + prosthetic_prefix = "prs" + organ_slowdown = 1.1 + brute_reduction = 10 + burn_reduction = 10 + sellprice = 40 + +/obj/item/bodypart/l_leg/rprosthetic/clock + name = "clockwork leg (L)" + desc = "A left leg of cogs and gold." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prc_leg" + prosthetic_prefix = "prc" + organ_slowdown = 0 + sellprice = 50 + +/obj/item/bodypart/l_leg/rprosthetic/attack(mob/living/M, mob/user) + prosthetic_attachment(M, user) + +/obj/item/bodypart/r_leg/rprosthetic + name = "peg leg (R)" + desc = "A right leg of wood." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pr_leg" + resistance_flags = FLAMMABLE + obj_flags = CAN_BE_HIT + status = BODYPART_ROBOTIC + brute_reduction = 0 + burn_reduction = 0 + max_damage = 20 + w_class = WEIGHT_CLASS_NORMAL + max_integrity = 300 + sellprice = 20 + organ_slowdown = 1.3 + +/obj/item/bodypart/r_leg/rprosthetic/iron + name = "iron leg (R)" + desc = "A right leg of iron." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "pri_leg" + prosthetic_prefix = "pri" + organ_slowdown = 1.2 + brute_reduction = 5 + burn_reduction = 5 + sellprice = 30 + +/obj/item/bodypart/r_leg/rprosthetic/steel + name = "steel leg (R)" + desc = "A right leg of steel." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prs_leg" + prosthetic_prefix = "prs" + organ_slowdown = 1.1 + brute_reduction = 10 + burn_reduction = 10 + sellprice = 40 + +/obj/item/bodypart/r_leg/rprosthetic/clock + name = "clockwork leg (R)" + desc = "A right leg of cogs and gold." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "prc_leg" + prosthetic_prefix = "prc" + organ_slowdown = 0 + sellprice = 50 + +/obj/item/bodypart/r_leg/rprosthetic/attack(mob/living/M, mob/user) + prosthetic_attachment(M, user) \ No newline at end of file diff --git a/code/modules/cargo/packsrogue/tools.dm b/code/modules/cargo/packsrogue/tools.dm index ca14aa634..5d3cb76a9 100644 --- a/code/modules/cargo/packsrogue/tools.dm +++ b/code/modules/cargo/packsrogue/tools.dm @@ -103,14 +103,14 @@ ) /datum/supply_pack/rogue/tools/prarml - name = "Proesthetic Arm (L)" + name = "Prosthetic Arm (L)" cost = 40 - contains = list(/obj/item/bodypart/l_arm/rproesthetic) + contains = list(/obj/item/bodypart/l_arm/rprosthetic) /datum/supply_pack/rogue/tools/prarmr - name = "Proesthetic Arm (R)" + name = "Prosthetic Arm (R)" cost = 40 - contains = list(/obj/item/bodypart/r_arm/rproesthetic) + contains = list(/obj/item/bodypart/r_arm/rprosthetic) /datum/supply_pack/rogue/tools/waterskin name = "Waterskin" diff --git a/code/modules/mob/living/grabbing.dm b/code/modules/mob/living/grabbing.dm index f00d5563b..d4db0d0e2 100644 --- a/code/modules/mob/living/grabbing.dm +++ b/code/modules/mob/living/grabbing.dm @@ -209,6 +209,12 @@ var/mob/living/carbon/C = grabbed var/armor_block = C.run_armor_check(limb_grabbed, "slash") var/damage = user.get_punch_dmg() + + if(limb_grabbed.status == BODYPART_ROBOTIC) + C.visible_message(span_notice("[user] twists [limb_grabbed] of [C], popping it out of the socket!"), span_notice("I pop [limb_grabbed] from [src].")) + limb_grabbed.drop_limb() + return + playsound(C.loc, "genblunt", 100, FALSE, -1) C.next_attack_msg.Cut() C.apply_damage(damage, BRUTE, limb_grabbed, armor_block) diff --git a/code/modules/roguetown/roguecrafting/items.dm b/code/modules/roguetown/roguecrafting/items.dm index 783349f3d..4770fc035 100644 --- a/code/modules/roguetown/roguecrafting/items.dm +++ b/code/modules/roguetown/roguecrafting/items.dm @@ -167,22 +167,36 @@ tools = list(/obj/item/rogueweapon/hammer) craftdiff = 3 -/datum/crafting_recipe/roguetown/lproesthetic +/datum/crafting_recipe/roguetown/larmprosthetic_w name = "wood arm (L)" - result = list(/obj/item/bodypart/l_arm/rproesthetic) + result = list(/obj/item/bodypart/l_arm/rprosthetic) reqs = list(/obj/item/grown/log/tree/small = 1, /obj/item/roguegear = 1) skillcraft = /datum/skill/craft/carpentry craftdiff = 3 -/datum/crafting_recipe/roguetown/rproesthetic +/datum/crafting_recipe/roguetown/rarmprosthetic_w name = "wood arm (R)" - result = list(/obj/item/bodypart/r_arm/rproesthetic) + result = list(/obj/item/bodypart/r_arm/rprosthetic) reqs = list(/obj/item/grown/log/tree/small = 1, /obj/item/roguegear = 1) skillcraft = /datum/skill/craft/carpentry craftdiff = 3 +/datum/crafting_recipe/roguetown/rlegprosthetic_w + name = "peg leg (R)" + result = list(/obj/item/bodypart/r_leg/rprosthetic) + reqs = list(/obj/item/grown/log/tree/small = 1) + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 + +/datum/crafting_recipe/roguetown/llegprosthetic_w + name = "peg_leg (L)" + result = list(/obj/item/bodypart/l_leg/rprosthetic) + reqs = list(/obj/item/grown/log/tree/small = 1) + skillcraft = /datum/skill/craft/carpentry + craftdiff = 1 + /obj/item/rogueweapon/mace/woodclub/crafted sellprice = 8 diff --git a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/tools.dm b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/tools.dm index 34538441b..50ce46025 100644 --- a/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/tools.dm +++ b/code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/tools.dm @@ -122,6 +122,30 @@ req_bar = /obj/item/ingot/iron created_item = /obj/item/reagent_containers/glass/bucket/pot +/datum/anvil_recipe/tools/iron_arm_left + name = "Iron arm (L)" + req_bar = /obj/item/ingot/iron + created_item = /obj/item/bodypart/l_arm/rprosthetic/iron + additional_items = list(/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/iron_arm_right + name = "Iron arm (R)" + req_bar = /obj/item/ingot/iron + created_item = /obj/item/bodypart/r_arm/rprosthetic/iron + additional_items = list(/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/iron_leg_left + name = "Iron leg (L)" + req_bar = /obj/item/ingot/iron + created_item = /obj/item/bodypart/l_leg/rprosthetic/iron + additional_items = list(/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/iron_leg_right + name = "Iron leg (R)" + req_bar = /obj/item/ingot/iron + created_item = /obj/item/bodypart/r_leg/rprosthetic/iron + additional_items = list(/obj/item/roguegear) + i_type = "General" // --------- Steel ----------- /datum/anvil_recipe/tools/steelpick @@ -182,6 +206,31 @@ created_item = list(/obj/item/roguegear, /obj/item/roguegear, /obj/item/roguegear) i_type = "General" +/datum/anvil_recipe/tools/steel_arm_left + name = "Steel arm (L)" + req_bar = /obj/item/ingot/steel + created_item = /obj/item/bodypart/l_arm/rprosthetic/steel + additional_items = list(/obj/item/roguegear) + +/datum/anvil_recipe/tools/steel_arm_right + name = "Steel arm (R)" + req_bar = /obj/item/ingot/steel + created_item = /obj/item/bodypart/r_arm/rprosthetic/steel + additional_items = list(/obj/item/roguegear) + i_type = "General" + +/datum/anvil_recipe/tools/steel_leg_left + name = "Steel leg (L)" + req_bar = /obj/item/ingot/steel + created_item = /obj/item/bodypart/l_leg/rprosthetic/steel + additional_items = list(/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/steel_leg_right + name = "Steel leg (R)" + req_bar = /obj/item/ingot/steel + created_item = /obj/item/bodypart/r_leg/rprosthetic/steel + additional_items = list(/obj/item/roguegear) + i_type = "General" // --------- SILVER ----------- /datum/anvil_recipe/tools/cupssil @@ -197,3 +246,28 @@ req_bar = /obj/item/ingot/gold created_item = list(/obj/item/reagent_containers/glass/cup/golden, /obj/item/reagent_containers/glass/cup/golden, /obj/item/reagent_containers/glass/cup/golden) i_type = "General" + +/datum/anvil_recipe/tools/clock_arm_left + name = "Clockwork arm (L)" + req_bar = /obj/item/ingot/gold + created_item = /obj/item/bodypart/l_arm/rprosthetic/clock + additional_items = list(/obj/item/roguegear,/obj/item/roguegear,/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/clock_arm_right + name = "Clockwork arm (R)" + req_bar = /obj/item/ingot/gold + created_item = /obj/item/bodypart/r_arm/rprosthetic/clock + additional_items = list(/obj/item/roguegear,/obj/item/roguegear,/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/clock_leg_left + name = "Clockwork leg (L)" + req_bar = /obj/item/ingot/gold + created_item = /obj/item/bodypart/l_leg/rprosthetic/clock + additional_items = list(/obj/item/roguegear,/obj/item/roguegear,/obj/item/roguegear) + i_type = "General" +/datum/anvil_recipe/tools/clock_leg_right + name = "Clockwork leg (R)" + req_bar = /obj/item/ingot/gold + created_item = /obj/item/bodypart/r_leg/rprosthetic/clock + additional_items = list(/obj/item/roguegear,/obj/item/roguegear,/obj/item/roguegear) + i_type = "General" diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 81cfd7819..0df9c1d31 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -50,6 +50,7 @@ var/species_icon = "" var/animal_origin = null //for nonhuman bodypart (e.g. monkey) + var/prosthetic_prefix = "pr" // for unique prosthetic icons on mob var/dismemberable = 1 //whether it can be dismembered with a weapon. var/disableable = 1 @@ -84,6 +85,7 @@ var/skeletonized = FALSE var/fingers = TRUE + var/organ_slowdown = 0 // Its here because this is first shared definition between two leg organ paths /// Visaul markings to be rendered alongside the bodypart var/list/markings @@ -573,10 +575,11 @@ else limb.icon = species_icon - limb.icon_state = "pr_[body_zone]" + limb.icon_state = "[prosthetic_prefix]_[body_zone]" if(aux_zone) if(!hideaux) - aux = image(limb.icon, "pr_[aux_zone]", -aux_layer, image_dir) + //Prosthetic arms do not have additional hand icons on them, because of this they do not render above clothing, this is why aux image uses body_zone var instead of aux_zone// + aux = image(limb.icon, "[prosthetic_prefix]_[body_zone]", -aux_layer, image_dir) . += aux @@ -591,7 +594,7 @@ limb.color = "#[draw_color]" if(aux_zone && !hideaux) aux.color = "#[draw_color]" - + var/draw_organ_features = TRUE var/draw_bodypart_features = TRUE if(owner && owner.dna) @@ -600,13 +603,13 @@ draw_organ_features = FALSE if(NO_BODYPART_FEATURES in owner_species.species_traits) draw_bodypart_features = FALSE - + // Markings overlays if(!skeletonized) var/list/marking_overlays = get_markings_overlays(override_color) if(marking_overlays) . += marking_overlays - + // Organ overlays if(!rotted && !skeletonized && draw_organ_features) for(var/obj/item/organ/organ as anything in get_organs()) @@ -615,7 +618,7 @@ var/mutable_appearance/organ_appearance = organ.get_bodypart_overlay(src) if(organ_appearance) . += organ_appearance - + // Feature overlays if(!skeletonized && draw_bodypart_features) for(var/datum/bodypart_feature/feature as anything in bodypart_features) diff --git a/code/modules/surgery/bodyparts/bodypart_dismemberment.dm b/code/modules/surgery/bodyparts/bodypart_dismemberment.dm index 452ee7c37..ad048a8fa 100644 --- a/code/modules/surgery/bodyparts/bodypart_dismemberment.dm +++ b/code/modules/surgery/bodyparts/bodypart_dismemberment.dm @@ -150,6 +150,9 @@ was_owner.bodyparts -= src owner = null + if(organ_slowdown) + was_owner.remove_movespeed_modifier("[src.type]_slow", update = TRUE) + update_icon_dropped() was_owner.update_health_hud() //update the healthdoll was_owner.update_body() @@ -361,7 +364,8 @@ affecting.remove_wound(dismember_wound) update_bodypart_damage_state() - + if(organ_slowdown) + C.add_movespeed_modifier("[src.type]_slow", update=TRUE, priority=100, flags=NONE, override=FALSE, multiplicative_slowdown=organ_slowdown, movetypes=GROUND, blacklisted_movetypes=NONE, conflict=FALSE) C.updatehealth() C.update_body() C.update_hair() diff --git a/icons/mob/species/anthro_small_female.dmi b/icons/mob/species/anthro_small_female.dmi index f89c91cc7..b59816433 100644 Binary files a/icons/mob/species/anthro_small_female.dmi and b/icons/mob/species/anthro_small_female.dmi differ diff --git a/icons/mob/species/anthro_small_male.dmi b/icons/mob/species/anthro_small_male.dmi index 378e4ed06..fa27e32dd 100644 Binary files a/icons/mob/species/anthro_small_male.dmi and b/icons/mob/species/anthro_small_male.dmi differ diff --git a/icons/mob/species/female.dmi b/icons/mob/species/female.dmi index f4c988fee..ebc28e4b7 100644 Binary files a/icons/mob/species/female.dmi and b/icons/mob/species/female.dmi differ diff --git a/icons/mob/species/goblin_female.dmi b/icons/mob/species/goblin_female.dmi index b8bf4f83a..83669050e 100644 Binary files a/icons/mob/species/goblin_female.dmi and b/icons/mob/species/goblin_female.dmi differ diff --git a/icons/mob/species/goblin_male.dmi b/icons/mob/species/goblin_male.dmi index fbc57720d..cbcb27ecb 100644 Binary files a/icons/mob/species/goblin_male.dmi and b/icons/mob/species/goblin_male.dmi differ diff --git a/icons/mob/species/male.dmi b/icons/mob/species/male.dmi index 590b7dd34..2bd9f0c6e 100644 Binary files a/icons/mob/species/male.dmi and b/icons/mob/species/male.dmi differ diff --git a/icons/mob/species/moth_f.dmi b/icons/mob/species/moth_f.dmi index 441380725..256a97c4b 100644 Binary files a/icons/mob/species/moth_f.dmi and b/icons/mob/species/moth_f.dmi differ diff --git a/icons/mob/species/moth_m.dmi b/icons/mob/species/moth_m.dmi index 43338165b..a368e9a71 100644 Binary files a/icons/mob/species/moth_m.dmi and b/icons/mob/species/moth_m.dmi differ diff --git a/icons/roguetown/items/misc.dmi b/icons/roguetown/items/misc.dmi index ad621a77d..b1d4b069c 100644 Binary files a/icons/roguetown/items/misc.dmi and b/icons/roguetown/items/misc.dmi differ diff --git a/icons/roguetown/mob/bodies/f/fd.dmi b/icons/roguetown/mob/bodies/f/fd.dmi index 3d4be2211..2a9b51e5c 100644 Binary files a/icons/roguetown/mob/bodies/f/fd.dmi and b/icons/roguetown/mob/bodies/f/fd.dmi differ diff --git a/icons/roguetown/mob/bodies/f/fm.dmi b/icons/roguetown/mob/bodies/f/fm.dmi index fceaa3e96..c6338b750 100644 Binary files a/icons/roguetown/mob/bodies/f/fm.dmi and b/icons/roguetown/mob/bodies/f/fm.dmi differ diff --git a/icons/roguetown/mob/bodies/f/ft_muscular.dmi b/icons/roguetown/mob/bodies/f/ft_muscular.dmi index 65aeee6fe..6b38d7bd5 100644 Binary files a/icons/roguetown/mob/bodies/f/ft_muscular.dmi and b/icons/roguetown/mob/bodies/f/ft_muscular.dmi differ diff --git a/icons/roguetown/mob/bodies/m/md.dmi b/icons/roguetown/mob/bodies/m/md.dmi index b625da594..462174559 100644 Binary files a/icons/roguetown/mob/bodies/m/md.dmi and b/icons/roguetown/mob/bodies/m/md.dmi differ diff --git a/icons/roguetown/mob/bodies/m/mem.dmi b/icons/roguetown/mob/bodies/m/mem.dmi index e31c9f675..d681d8292 100644 Binary files a/icons/roguetown/mob/bodies/m/mem.dmi and b/icons/roguetown/mob/bodies/m/mem.dmi differ diff --git a/icons/roguetown/mob/bodies/m/met.dmi b/icons/roguetown/mob/bodies/m/met.dmi index 03dc1e966..6dc769d45 100644 Binary files a/icons/roguetown/mob/bodies/m/met.dmi and b/icons/roguetown/mob/bodies/m/met.dmi differ diff --git a/icons/roguetown/mob/bodies/m/mt.dmi b/icons/roguetown/mob/bodies/m/mt.dmi index 6df9db60d..864f38071 100644 Binary files a/icons/roguetown/mob/bodies/m/mt.dmi and b/icons/roguetown/mob/bodies/m/mt.dmi differ diff --git a/icons/roguetown/mob/bodies/m/mt_muscular.dmi b/icons/roguetown/mob/bodies/m/mt_muscular.dmi index ab335616a..15df4cc22 100644 Binary files a/icons/roguetown/mob/bodies/m/mt_muscular.dmi and b/icons/roguetown/mob/bodies/m/mt_muscular.dmi differ diff --git a/roguetown.dme b/roguetown.dme index 7d633b72d..ee1f60ba9 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -1228,7 +1228,7 @@ #include "code\game\objects\items\rogueitems\natural.dm" #include "code\game\objects\items\rogueitems\needle.dm" #include "code\game\objects\items\rogueitems\painting.dm" -#include "code\game\objects\items\rogueitems\prostheticarm.dm" +#include "code\game\objects\items\rogueitems\prosthetics.dm" #include "code\game\objects\items\rogueitems\ropechainbola.dm" #include "code\game\objects\items\rogueitems\undies.dm" #include "code\game\objects\items\rogueitems\waterskin.dm"