diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 0afa4945d2..f4b5ec9efe 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -56,6 +56,7 @@ name = "bluespace polycrystal" icon = 'icons/obj/telescience.dmi' icon_state = "polycrystal" + item_state = "sheet-polycrystal" desc = "A stable polycrystal, made of fused-together bluespace crystals. You could probably break one off." materials = list(MAT_BLUESPACE=MINERAL_MATERIAL_AMOUNT) attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed") diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index d344f5eeda..182522cd09 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ desc = "HOLY SHEET! That is a lot of glass." singular_name = "glass sheet" icon_state = "sheet-glass" + item_state = "sheet-glass" materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100) resistance_flags = ACID_PROOF @@ -80,6 +81,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \ desc = "A glass sheet made out of a plasma-silicate alloy. It looks extremely tough and heavily fire resistant." singular_name = "plasma glass sheet" icon_state = "sheet-pglass" + item_state = "sheet-pglass" materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100) resistance_flags = ACID_PROOF @@ -130,6 +132,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \ desc = "Glass which seems to have rods or something stuck in them." singular_name = "reinforced glass sheet" icon_state = "sheet-rglass" + item_state = "sheet-rglass" materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100) resistance_flags = ACID_PROOF @@ -171,6 +174,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \ desc = "A glass sheet made out of a plasma-silicate alloy and a rod matrice. It looks hopelessly tough and nearly fire-proof!" singular_name = "reinforced plasma glass sheet" icon_state = "sheet-prglass" + item_state = "sheet-prglass" materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF @@ -190,6 +194,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( desc = "A glass sheet made out of a titanium-silicate alloy." singular_name = "titanium glass sheet" icon_state = "sheet-titaniumglass" + item_state = "sheet-titaniumglass" materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF @@ -208,6 +213,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( desc = "A glass sheet made out of a plasma-titanium-silicate alloy." singular_name = "plastitanium glass sheet" icon_state = "sheet-plastitaniumglass" + item_state = "sheet-plastitaniumglass" materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 60f6560d16..cfccedcc3a 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -1,13 +1,14 @@ /obj/item/stack/sheet/animalhide name = "hide" desc = "Something went wrong." + icon_state = "sheet-hide" + item_state = "sheet-hide" novariants = TRUE /obj/item/stack/sheet/animalhide/human name = "human skin" desc = "The by-product of human farming." singular_name = "human skin piece" - icon_state = "sheet-hide" novariants = FALSE GLOBAL_LIST_INIT(human_recipes, list( \ @@ -22,7 +23,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \ name = "skin" desc = "A piece of skin." singular_name = "skin piece" - icon_state = "sheet-hide" novariants = FALSE /obj/item/stack/sheet/animalhide/corgi @@ -30,12 +30,14 @@ GLOBAL_LIST_INIT(human_recipes, list( \ desc = "The by-product of corgi farming." singular_name = "corgi hide piece" icon_state = "sheet-corgi" + item_state = "sheet-corgi" /obj/item/stack/sheet/animalhide/gondola name = "gondola hide" desc = "The extremely valuable by-product of gondola hunting." singular_name = "gondola hide piece" icon_state = "sheet-gondola" + item_state = "sheet-gondola" GLOBAL_LIST_INIT(corgi_recipes, list ( \ @@ -51,12 +53,14 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \ desc = "The by-product of cat farming." singular_name = "cat hide piece" icon_state = "sheet-cat" + item_state = "sheet-cat" /obj/item/stack/sheet/animalhide/monkey name = "monkey hide" desc = "The by-product of monkey farming." singular_name = "monkey hide piece" icon_state = "sheet-monkey" + icon_state = "sheet-monkey" GLOBAL_LIST_INIT(monkey_recipes, list ( \ new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \ @@ -72,12 +76,14 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \ desc = "Sssssss..." singular_name = "lizard skin piece" icon_state = "sheet-lizard" + item_state = "sheet-lizard" /obj/item/stack/sheet/animalhide/xeno name = "alien hide" desc = "The skin of a terrible creature." singular_name = "alien hide piece" icon_state = "sheet-xeno" + item_state = "sheet-xeno" GLOBAL_LIST_INIT(xeno_recipes, list ( \ new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1), \ @@ -114,12 +120,14 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \ desc = "This hide was stripped of its hair, but still needs washing and tanning." singular_name = "hairless hide piece" icon_state = "sheet-hairlesshide" + item_state = "sheet-hairlesshide" /obj/item/stack/sheet/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" + item_state = "sheet-wetleather" var/wetness = 30 //Reduced when exposed to high temperautres var/drying_threshold_temperature = 500 //Kelvin to start drying @@ -131,6 +139,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \ desc = "The by-product of mob grinding." singular_name = "leather piece" icon_state = "sheet-leather" + item_state = "sheet-leather" GLOBAL_LIST_INIT(leather_recipes, list ( \ new/datum/stack_recipe("wallet", /obj/item/storage/wallet, 1), \ diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 7e280724d4..b8b1db43ed 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -44,6 +44,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ desc = "This appears to be a combination of both sand and stone." singular_name = "sandstone brick" icon_state = "sheet-sandstone" + item_state = "sheet-sandstone" throw_speed = 3 throw_range = 5 materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) @@ -100,6 +101,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/stack/sheet/mineral/diamond name = "diamond" icon_state = "sheet-diamond" + item_state = "sheet-diamond" singular_name = "diamond" sheettype = "diamond" materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT) @@ -123,6 +125,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ /obj/item/stack/sheet/mineral/uranium name = "uranium" icon_state = "sheet-uranium" + item_state = "sheet-uranium" singular_name = "uranium sheet" sheettype = "uranium" materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT) @@ -146,6 +149,7 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ /obj/item/stack/sheet/mineral/plasma name = "solid plasma" icon_state = "sheet-plasma" + item_state = "sheet-plasma" singular_name = "plasma sheet" sheettype = "plasma" resistance_flags = FLAMMABLE @@ -186,6 +190,7 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \ /obj/item/stack/sheet/mineral/gold name = "gold" icon_state = "sheet-gold" + item_state = "sheet-gold" singular_name = "gold bar" sheettype = "gold" materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT) @@ -212,6 +217,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \ /obj/item/stack/sheet/mineral/silver name = "silver" icon_state = "sheet-silver" + item_state = "sheet-silver" singular_name = "silver bar" sheettype = "silver" materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT) @@ -237,6 +243,7 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \ /obj/item/stack/sheet/mineral/bananium name = "bananium" icon_state = "sheet-bananium" + item_state = "sheet-bananium" singular_name = "bananium sheet" sheettype = "bananium" materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) @@ -258,6 +265,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ /obj/item/stack/sheet/mineral/titanium name = "titanium" icon_state = "sheet-titanium" + item_state = "sheet-titanium" singular_name = "titanium sheet" force = 5 throwforce = 5 @@ -285,6 +293,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \ /obj/item/stack/sheet/mineral/plastitanium name = "plastitanium" icon_state = "sheet-plastitanium" + item_state = "sheet-plastitanium" singular_name = "plastitanium sheet" force = 5 throwforce = 5 @@ -309,6 +318,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \ /obj/item/stack/sheet/mineral/snow name = "snow" icon_state = "sheet-snow" + item_state = "sheet-snow" singular_name = "snow block" force = 1 throwforce = 2 @@ -332,6 +342,7 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \ /obj/item/stack/sheet/mineral/enruranium name = "enriched uranium" icon_state = "sheet-enruranium" + item_state = "sheet-enruranium" singular_name = "enriched uranium sheet" materials = list(MAT_URANIUM=3000) @@ -345,6 +356,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( /obj/item/stack/sheet/mineral/adamantine name = "adamantine" icon_state = "sheet-adamantine" + item_state = "sheet-adamantine" singular_name = "adamantine sheet" /obj/item/stack/sheet/mineral/adamantine/Initialize(mapload, new_amount, merge = TRUE) @@ -357,6 +369,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( /obj/item/stack/sheet/mineral/mythril name = "mythril" icon_state = "sheet-mythril" + item_state = "sheet-mythril" singular_name = "mythril sheet" novariants = TRUE @@ -367,6 +380,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( name = "alien alloy" icon = 'icons/obj/abductor.dmi' icon_state = "sheet-abductor" + item_state = "sheet-abductor" singular_name = "alien alloy sheet" sheettype = "abductor" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e5468675e2..ad752ba14a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -98,6 +98,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ desc = "Sheets made out of metal." singular_name = "metal sheet" icon_state = "sheet-metal" + item_state = "sheet-metal" materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) throwforce = 10 flags_1 = CONDUCT_1 @@ -206,6 +207,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ desc = "One can only guess that this is a bunch of wood." singular_name = "wood plank" icon_state = "sheet-wood" + item_state = "sheet-wood" icon = 'icons/obj/stack_objects.dmi' sheettype = "wood" armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) @@ -253,6 +255,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ desc = "Is it cotton? Linen? Denim? Burlap? Canvas? You can't tell." singular_name = "cloth roll" icon_state = "sheet-cloth" + item_state = "sheet-cloth" resistance_flags = FLAMMABLE force = 0 throwforce = 0 @@ -286,6 +289,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ desc = "Large sheets of card, like boxes folded flat." singular_name = "cardboard sheet" icon_state = "sheet-card" + item_state = "sheet-card" resistance_flags = FLAMMABLE force = 0 throwforce = 0 @@ -329,6 +333,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \ desc = "Sheets of cold metal with shifting inscriptions writ upon them." singular_name = "runed metal sheet" icon_state = "sheet-runed" + item_state = "sheet-runed" icon = 'icons/obj/stack_objects.dmi' sheettype = "runed" merge_type = /obj/item/stack/sheet/runed_metal @@ -386,6 +391,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ desc = "Sheets made out of brass." singular_name = "brass sheet" icon_state = "sheet-brass" + item_state = "sheet-brass" icon = 'icons/obj/stack_objects.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF throwforce = 10 @@ -420,6 +426,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects." singular_name = "lesser gem" icon_state = "sheet-lessergem" + item_state = "sheet-lessergem" novariants = TRUE @@ -428,6 +435,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects." singular_name = "greater gem" icon_state = "sheet-greatergem" + item_state = "sheet-greatergem" novariants = TRUE /* @@ -437,6 +445,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ name = "bones" icon = 'icons/obj/mining.dmi' icon_state = "bone" + item_state = "sheet-bone" singular_name = "bone" desc = "Someone's been drinking their milk." force = 7 @@ -458,6 +467,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list( desc = "Compress dinosaur over millions of years, then refine, split and mold, and voila! You have plastic." singular_name = "plastic sheet" icon_state = "sheet-plastic" + item_state = "sheet-plastic" materials = list(MAT_PLASTIC=MINERAL_MATERIAL_AMOUNT) throwforce = 7 merge_type = /obj/item/stack/sheet/plastic @@ -481,6 +491,7 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra desc = "A thin wooden frame with paper attached." singular_name = "paper frame" icon_state = "sheet-paper" + item_state = "sheet-paper" merge_type = /obj/item/stack/sheet/paperframes resistance_flags = FLAMMABLE diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 5ce6abc73d..e6bc5f1151 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -11,11 +11,12 @@ name = "rock" icon = 'icons/obj/mining.dmi' icon_state = "ore" + item_state = "ore" full_w_class = WEIGHT_CLASS_BULKY singular_name = "ore chunk" var/points = 0 //How many points this ore gets you from the ore redemption machine var/refined_type = null //What this ore defaults to being refined into - novariants = FALSE // Ore stacks handle their icon updates themselves to keep the illusion that there's more going + novariants = TRUE // Ore stacks handle their icon updates themselves to keep the illusion that there's more going var/list/stack_overlays /obj/item/stack/ore/add(amount) @@ -52,6 +53,7 @@ /obj/item/stack/ore/uranium name = "uranium ore" icon_state = "Uranium ore" + item_state = "Uranium ore" singular_name = "uranium ore chunk" points = 30 materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT) @@ -60,6 +62,7 @@ /obj/item/stack/ore/iron name = "iron ore" icon_state = "Iron ore" + item_state = "Iron ore" singular_name = "iron ore chunk" points = 1 materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) @@ -68,6 +71,7 @@ /obj/item/stack/ore/glass name = "sand pile" icon_state = "Glass ore" + item_state = "Glass ore" singular_name = "sand pile" points = 1 materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) @@ -104,11 +108,13 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/glass/basalt name = "volcanic ash" icon_state = "volcanic_sand" + icon_state = "volcanic_sand" singular_name = "volcanic ash pile" /obj/item/stack/ore/plasma name = "plasma ore" icon_state = "Plasma ore" + item_state = "Plasma ore" singular_name = "plasma ore chunk" points = 15 materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT) @@ -122,6 +128,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/silver name = "silver ore" icon_state = "Silver ore" + item_state = "Silver ore" singular_name = "silver ore chunk" points = 16 materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT) @@ -130,6 +137,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/gold name = "gold ore" icon_state = "Gold ore" + icon_state = "Gold ore" singular_name = "gold ore chunk" points = 18 materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT) @@ -138,6 +146,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/diamond name = "diamond ore" icon_state = "Diamond ore" + item_state = "Diamond ore" singular_name = "diamond ore chunk" points = 50 materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT) @@ -146,6 +155,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/bananium name = "bananium ore" icon_state = "Bananium ore" + item_state = "Bananium ore" singular_name = "bananium ore chunk" points = 60 materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) @@ -154,6 +164,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/titanium name = "titanium ore" icon_state = "Titanium ore" + item_state = "Titanium ore" singular_name = "titanium ore chunk" points = 50 materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) @@ -163,6 +174,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ name = "slag" desc = "Completely useless." icon_state = "slag" + item_state = "slag" singular_name = "slag chunk" /obj/item/twohanded/required/gibtonite diff --git a/icons/mob/inhands/misc/sheets_lefthand.dmi b/icons/mob/inhands/misc/sheets_lefthand.dmi index d1d929371f..cf3c5e8f17 100644 Binary files a/icons/mob/inhands/misc/sheets_lefthand.dmi and b/icons/mob/inhands/misc/sheets_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/sheets_righthand.dmi b/icons/mob/inhands/misc/sheets_righthand.dmi index 3c46b63b94..bfe05836b0 100644 Binary files a/icons/mob/inhands/misc/sheets_righthand.dmi and b/icons/mob/inhands/misc/sheets_righthand.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index e844d9c7a6..d5d615b593 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ