diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 838a1b576..f0333072a 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -37,9 +37,9 @@ if(O.status == BODYPART_ROBOTIC) return - var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET)) + var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET))) - if(!(flags & CALTROP_BYPASS_SHOES) && (H.shoes || feetCover)) + if(!(flags & CALTROP_BYPASS_SHOES) && feetCover) return if((H.movement_type & FLYING) || H.buckled) diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm index fd25f9722..c4bf893c1 100644 --- a/code/datums/components/footstep.dm +++ b/code/datums/components/footstep.dm @@ -89,19 +89,19 @@ return if(ishuman(LM)) //for proper humans, they're special var/mob/living/carbon/human/H = LM - var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET)) + var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET))) if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") //are we a naga or tentacle taur creature playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v) return - if(H.shoes || feetCover) //are we wearing shoes + if(feetCover) //are we wearing shoes playsound(T, pick(GLOB.footstep[T.footstep][1]), GLOB.footstep[T.footstep][2] * v, TRUE, GLOB.footstep[T.footstep][3] + e) - if((!H.shoes && !feetCover)) //are we NOT wearing shoes + if(!feetCover) //are we NOT wearing shoes playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]), GLOB.barefootstep[T.barefootstep][2] * v, TRUE, diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 269deec47..86abd2982 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2966,6 +2966,22 @@ crate_name = "captain pen" crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen +/datum/supply_pack/misc/exoticfootwear + name = "Exotic Footwear Crate" + desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." + cost = 4337 + contains = list(/obj/item/clothing/shoes/wraps, + /obj/item/clothing/shoes/wraps, + /obj/item/clothing/shoes/wraps/silver, + /obj/item/clothing/shoes/wraps/silver, + /obj/item/clothing/shoes/wraps/red, + /obj/item/clothing/shoes/wraps/red, + /obj/item/clothing/shoes/wraps/blue, + /obj/item/clothing/shoes/wraps/blue, + /obj/item/clothing/shoes/clown_shoes, + /obj/item/clothing/shoes/kindleKicks) + crate_name = "footie crate" + /datum/supply_pack/misc/randombedsheets name = "Bedsheet Crate (R)" desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 4659de3e6..2980993bf 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -312,3 +312,24 @@ set_light(0) lightCycle = 0 active = FALSE + +/obj/item/clothing/shoes/wraps + name = "gilded leg wraps" + desc = "Ankle coverings. These ones have a golden design." + icon_state = "gildedcuffs" + body_parts_covered = FALSE + +/obj/item/clothing/shoes/wraps/silver + name = "silver leg wraps" + desc = "Ankle coverings. Not made of real silver." + icon_state = "silvergildedcuffs" + +/obj/item/clothing/shoes/wraps/red + name = "red leg wraps" + desc = "Ankle coverings. Show off your style with these shiny red ones!" + icon_state = "redcuffs" + +/obj/item/clothing/shoes/wraps/blue + name = "blue leg wraps" + desc = "Ankle coverings. Hang ten, brother." + icon_state = "bluecuffs" \ No newline at end of file diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index e7598f35c..0d73a5add 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index a042f30ea..95335bc92 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm index 95675ccae..7baa8eff2 100644 --- a/modular_citadel/code/modules/client/loadout/shoes.dm +++ b/modular_citadel/code/modules/client/loadout/shoes.dm @@ -37,3 +37,23 @@ name = "White shoes" category = SLOT_SHOES path = /obj/item/clothing/shoes/sneakers/white + +/datum/gear/gildedcuffs + name = "Gilded leg wraps" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/wraps + +/datum/gear/silvercuffs + name = "Silver leg wraps" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/wraps/silver + +/datum/gear/redcuffs + name = "Red leg wraps" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/wraps/red + +/datum/gear/bluecuffs + name = "Blue leg wraps" + category = SLOT_SHOES + path= /obj/item/clothing/shoes/wraps/blue diff --git a/modular_citadel/icons/mob/digishoes.dmi b/modular_citadel/icons/mob/digishoes.dmi index a499db626..4641c4d39 100644 Binary files a/modular_citadel/icons/mob/digishoes.dmi and b/modular_citadel/icons/mob/digishoes.dmi differ