Some bugfixes (#10333)

This commit is contained in:
Wowzewow (Wezzy)
2020-10-24 23:03:59 +02:00
committed by GitHub
parent 9a7b84378e
commit b5a0a7cd4b
5 changed files with 10 additions and 6 deletions
@@ -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("<span class='notice'>\The [usr] starts cutting hair off \the [src]</span>", "<span class='notice'>You start cutting the hair off \the [src]</span>", "You hear the sound of a knife rubbing against flesh")
if(do_after(user,50))
to_chat(usr, "<span class='notice'>You cut the hair from this [src.singular_name]</span>")
to_chat(usr, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
//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)
@@ -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")
allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel")
+2 -2
View File
@@ -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)
))
))
+1 -1
View File
@@ -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
return
Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 150 KiB