Skip to content

Commit

Permalink
add: cloth footwraps now paintable, craftable and edible (#6042)
Browse files Browse the repository at this point in the history
  • Loading branch information
userbaza authored Nov 6, 2024
1 parent aeac202 commit fceaa15
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 48 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list(
new /datum/stack_recipe("White jumpsuit", /obj/item/clothing/under/color/white, 3),
new /datum/stack_recipe("White scarf", /obj/item/clothing/accessory/scarf/white),
new /datum/stack_recipe("White shoes", /obj/item/clothing/shoes/white, 2),
new /datum/stack_recipe("White footwraps", /obj/item/clothing/shoes/footwraps, 2),
new /datum/stack_recipe("White softcap", /obj/item/clothing/head/soft/mime, 2),
null,
new /datum/stack_recipe("Backpack", /obj/item/storage/backpack, 4),
Expand Down
12 changes: 2 additions & 10 deletions code/modules/client/preference/loadout/loadout_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,9 @@
path = /obj/item/clothing/shoes/leather_boots

/datum/gear/shoes/footwraps
display_name = "cloth footwraps, select"
display_name = "cloth footwraps, color"
path = /obj/item/clothing/shoes/footwraps

/datum/gear/shoes/footwraps/New()
..()
var/list/feet = list("classic" = /obj/item/clothing/shoes/footwraps,
"yellow" = /obj/item/clothing/shoes/footwraps/yellow,
"silver" = /obj/item/clothing/shoes/footwraps/silver,
"red" = /obj/item/clothing/shoes/footwraps/red,
"blue" = /obj/item/clothing/shoes/footwraps/blue,
"black" = /obj/item/clothing/shoes/footwraps/black,
"brown" = /obj/item/clothing/shoes/footwraps/brown,
)
gear_tweaks += new /datum/gear_tweak/path(feet, src)
gear_tweaks += new /datum/gear_tweak/color(parent = src)
51 changes: 14 additions & 37 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -399,43 +399,18 @@
/obj/item/clothing/shoes/cowboy/lizardmasterwork = 1)

/obj/item/clothing/shoes/footwraps
name = "cloth footwraps"
desc = "A roll of treated canvas used for wrapping claws or paws."
icon_state = "clothwrap"
item_state = "clothwrap"
force = 0
silence_steps = TRUE
w_class = WEIGHT_CLASS_SMALL

/obj/item/clothing/shoes/footwraps/yellow
name = "yellow cloth footwraps"
icon_state = "yellow_wrap"
item_state = "yellow_wrap"

/obj/item/clothing/shoes/footwraps/silver
name = "silver cloth footwraps"
icon_state = "silver_wrap"
item_state = "silver_wrap"

/obj/item/clothing/shoes/footwraps/red
name = "red cloth footwraps"
icon_state = "red_wrap"
item_state = "red_wrap"

/obj/item/clothing/shoes/footwraps/blue
name = "blue cloth footwraps"
icon_state = "blue_wrap"
item_state = "blue_wrap"

/obj/item/clothing/shoes/footwraps/black
name = "black cloth footwraps"
icon_state = "black_wrap"
item_state = "black_wrap"

/obj/item/clothing/shoes/footwraps/brown
name = "brown cloth footwraps"
icon_state = "brown_wrap"
item_state = "brown_wrap"
name = "cloth footwraps"
desc = "A roll of treated canvas used for wrapping claws or paws."
icon_state = "clothwrap"
item_state = "clothwrap"
force = 0
silence_steps = TRUE
w_class = WEIGHT_CLASS_SMALL
var/paintable = TRUE

/obj/item/clothing/shoes/footwraps/ComponentInitialize()
if(paintable)
AddComponent(/datum/component/spraycan_paintable)

/obj/item/clothing/shoes/footwraps/goliath
name = "goliath hide footwraps"
Expand All @@ -444,6 +419,7 @@
item_state = "footwraps_goliath"
armor = list("melee" = 5, "bullet" = 5, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0)
resistance_flags = FIRE_PROOF
paintable = FALSE

/obj/item/clothing/shoes/footwraps/dragon
name = "ash drake hide footwraps"
Expand All @@ -452,6 +428,7 @@
item_state = "footwraps_dragon"
armor = list("melee" = 10, "bullet" = 10, "laser" = 15, "energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 15, "acid" = 0)
resistance_flags = FIRE_PROOF | ACID_PROOF
paintable = FALSE

/obj/item/clothing/shoes/bhop
name = "jump boots"
Expand Down
12 changes: 11 additions & 1 deletion code/modules/food_and_drinks/item_food/eat_item_list_cloth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@
integrity_bite = 20, \
nutritional_value = 10, \
)

/obj/item/clothing/suit/cardborg/add_eatable_component()
AddComponent( \
/datum/component/eatable, \
Expand Down Expand Up @@ -624,3 +624,13 @@
nutritional_value = 10, \
)

// SHOES

/obj/item/clothing/shoes/footwraps/add_eatable_component()
AddComponent( \
/datum/component/eatable, \
material_type = MATERIAL_CLASS_CLOTH, \
max_bites = 4, \
integrity_bite = 20, \
nutritional_value = 10, \
)
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.

0 comments on commit fceaa15

Please sign in to comment.