From 7340461dbe20267e27cf8fbcbf7e63f879545c65 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 25 Feb 2021 07:18:45 +1000 Subject: [PATCH] Converts bindings to the weaving system --- code/_helpers/global_lists_vr.dm | 53 +------------------ .../station/station_special_abilities_vr.dm | 25 +-------- .../species/station/station_special_vr.dm | 3 ++ .../species/station/traits_vr/weaver_objs.dm | 11 ++++ .../station/traits_vr/weaver_recipies.dm | 6 ++- 5 files changed, 21 insertions(+), 77 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 795b2fe0682..d45406225c1 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -555,55 +555,4 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, return 1 // Hooks must return 1 var/global/list/weavable_structures = list() -var/global/list/weavable_items = list() -/* -jumpsuit -suit -dress -skirt -shorts -pants -socks (shoes) -footwraps -toeless socks (toesless boots) -sole covers (sandals) -thick socks (winter boots) -gloves -fingerless gloves -evening gloves -cap -top-hat -bowler hat -bandana -veil -beret -headband -waistcoast -poncho -cloak -jacket -labcoat -overcoat -winter coat -hoodie -robe/kimono -apron -hand bindings -foot bindings -overall bindings -blindfold -blindfold(fake) -muzzle -muzzle(fake) -earmuffs -earmuffs(fake) -bandages -bedsheet -bedsheet(large) -towel -teshari cloak -teshari undercoat -scarf -sweater -collar? -*/ \ No newline at end of file +var/global/list/weavable_items = list() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index ebdf6bb7ab7..f100a5fe3c3 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -943,7 +943,7 @@ while(finalized == "No" && src.client) choice = input(src,"What would you like to weave?") as null|anything in weavable_items - desired_result = weavable_structures[choice] + desired_result = weavable_items[choice] if(!desired_result || !istype(desired_result)) return @@ -997,26 +997,3 @@ species.silk_color = new_silk_color - - -/mob/living/proc/weaveWebBindings() - set name = "Weave Web Bindings" - set category = "Species Powers" - if(nutrition >= 30) //This isn't a huge problem. This is so you can bind people up. - src.visible_message("\the [src] pulls silk from their manibles and delicately weaves it into bindings.") - adjust_nutrition(-30) - spawn(30) //5 seconds to weave the bindings~ - var/obj/item/clothing/suit/web_bindings/bindings = new() //This sprite is amazing, I must say. - src.put_in_hands(bindings) - else - to_chat(src, "You do not have enough nutrition to create webbing!") //CK~ - -/obj/item/clothing/suit/web_bindings - icon = 'icons/vore/custom_clothes_vr.dmi' - icon_override = 'icons/vore/custom_clothes_vr.dmi' - name = "web bindings" - desc = "A webbed cocoon that completely restrains the wearer." - icon_state = "web_bindings" - item_state = "web_bindings_mob" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index f699afd9c70..587bdad143c 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -416,6 +416,9 @@ base_color = "#333333" //Blackish-gray blood_color = "#0952EF" //Spiders have blue blood. + silk_reserve = 500 + silk_max_reserve = 1000 + /datum/species/spider/handle_environment_special(var/mob/living/carbon/human/H) if(H.stat == DEAD) // If they're dead they won't need anything. return diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm index cbac3ed9182..3ea798f77de 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm @@ -95,3 +95,14 @@ // Items +// TODO: Spidersilk clothing and actual bindings, once sprites are ready. + +/obj/item/clothing/suit/web_bindings + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_override = 'icons/vore/custom_clothes_vr.dmi' + name = "web bindings" + desc = "A webbed cocoon that completely restrains the wearer." + icon_state = "web_bindings" + item_state = "web_bindings_mob" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_recipies.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_recipies.dm index 06c9856e150..83dc6637d1b 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_recipies.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_recipies.dm @@ -29,4 +29,8 @@ time = 15 SECONDS /datum/weaver_recipe/item - time = 10 SECONDS \ No newline at end of file + cost = 50 + +/datum/weaver_recipe/item/bindings + title = "bindings" + result_type = /obj/item/clothing/suit/web_bindings \ No newline at end of file