mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-19 03:50:32 +01:00
Merge pull request #116 from Azarak/footwraps
Adds in footwraps, available in loadout and a new cargo crate. Also fixes clown shoes since I'm touching the feet files so figured I might
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 = 3000
|
||||
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!"
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
/obj/item/clothing/shoes/clown_shoes
|
||||
desc = "The prankster's standard-issue clowning shoes. Damn, they're huge!"
|
||||
name = "clown shoes"
|
||||
icon_state = "clown"
|
||||
icon_state = "clown_shoes"
|
||||
item_state = "clown_shoes"
|
||||
slowdown = SHOES_SLOWDOWN+1
|
||||
item_color = "clown"
|
||||
@@ -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"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 14 KiB |
@@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 25 KiB |
Reference in New Issue
Block a user