From b5a0a7cd4b0c1b7bf5fa6a53a4fedd049c6db0a3 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Sun, 25 Oct 2020 05:03:59 +0800 Subject: [PATCH] Some bugfixes (#10333) --- .../objects/items/stacks/sheets/leather.dm | 7 +++++-- .../loadout/loadout_utility.dm | 3 ++- code/modules/materials/material_recipes.dm | 4 ++-- code/modules/tables/rack.dm | 2 +- icons/obj/clothing/suits.dmi | Bin 153616 -> 153613 bytes 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index be53adbb4cc..7d1d5fb9a39 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -61,6 +61,7 @@ singular_name = "alien hide piece" icon = 'icons/mob/npc/alien.dmi' icon_state = "chitin" + default_type = "alien hide" /obj/item/xenos_claw name = "alien claw" @@ -76,15 +77,17 @@ /obj/item/stack/material/hairlesshide name = "hairless hide" - desc = "This hide was stripped of it's hair, but still needs tanning." + desc = "This hide was stripped of it's hair, but still needs tanning. Maybe shove it in a washing machine?" singular_name = "hairless hide piece" icon_state = "sheet-hairlesshide" + default_type = "hairless hide" /obj/item/stack/material/wetleather name = "wet leather" desc = "This leather has been cleaned but still needs to be dried." singular_name = "wet leather piece" icon_state = "sheet-wetleather" + default_type = "wet leather" var/wetness = 30 //Reduced when exposed to high temperautres var/drying_threshold_temperature = 500 //Kelvin to start drying icon_has_variants = TRUE @@ -99,7 +102,7 @@ //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) usr.visible_message("\The [usr] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") if(do_after(user,50)) - to_chat(usr, "You cut the hair from this [src.singular_name]") + to_chat(usr, "You cut the hair from this [src.singular_name].") //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/material/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 68b9c0a4619..f270a379c1a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -82,6 +82,7 @@ /datum/gear/utility/lanyard display_name = "lanyard" path = /obj/item/storage/wallet/lanyard + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/utility/recorder display_name = "universal recorder" @@ -113,4 +114,4 @@ /datum/gear/utility/himeo_kit display_name = "himean voidsuit kit" path = /obj/item/himeo_kit - allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel") \ No newline at end of file + allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel") diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index 93847572b03..eef4890f466 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -65,7 +65,6 @@ list( new /datum/stack_recipe("key", /obj/item/key, 1, time = 10, one_per_turf = 0, on_floor = 1), new /datum/stack_recipe("custodial cart", /obj/structure/janitorialcart, BUILD_AMT, time = 120, one_per_turf = 1, on_floor = 1), - new /datum/stack_recipe("rack", /obj/structure/table/rack, BUILD_AMT, time = 5, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("closet", /obj/structure/closet, BUILD_AMT, time = 15, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1) )) @@ -146,6 +145,7 @@ ..() recipes += new /datum/stack_recipe_list("[display_name] recipes", list( + new /datum/stack_recipe("rack", /obj/structure/table/rack, BUILD_AMT, time = 5, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, BUILD_AMT, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("plastic bag", /obj/item/storage/bag/plasticbag, 3, on_floor = 1), new /datum/stack_recipe("blood pack", /obj/item/reagent_containers/blood/empty, 4, on_floor = 0), @@ -283,4 +283,4 @@ list( new /datum/stack_recipe("leather briefcase", /obj/item/storage/briefcase/real, 4, 1, time = 20), new /datum/stack_recipe("leather whip", /obj/item/melee/whip, 15, 1, time = 20) - )) \ No newline at end of file + )) diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index 8f4dfce0926..1ed9f10ad4b 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -31,4 +31,4 @@ /obj/structure/table/rack/holorack/dismantle(obj/item/wrench/W, mob/user) to_chat(user, SPAN_WARNING("You cannot dismantle \the [src].")) - return \ No newline at end of file + return diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 60895fbba4c37cc792b745158f221503842fd690..dce6e208a0e5bfbc07ab68519721149ea460f200 100644 GIT binary patch delta 82 zcmV-Y0ImO!unCQ@36LZK>9Hlw1|izS<~>t+-{hw$l{}}i`MmkhPrv;9)B6%WP64m# oP=H927Y9!Q2$!>H2dM!FGQZV-0g9D`gBb~j83_Tm83_XSPKm7~u>b%7 delta 85 zcmV-b0IL6uunCZ`36LZK?6D=z1|)*Ti9J(ctx12HQps~Fo6np7{PfGuKfN#E;}r0! r4)uY^lPr@I2TuYmo3mvHsR0NzQPqDKMBUee772$I2?4hj2?F;{$)6>q