diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 0c337d5c18d..2b71ec3e960 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -1,6 +1,8 @@ /obj/item/stack/sheet name = "sheet" icon = 'icons/obj/stacks/minerals.dmi' + lefthand_file = 'icons/mob/inhands/sheet_lefthand.dmi' + righthand_file = 'icons/mob/inhands/sheet_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL force = 5 throwforce = 5 diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index 7dbd03facb4..6c2f58e2c53 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -3,6 +3,8 @@ name = "wet floor sign" icon = 'icons/obj/janitor.dmi' icon_state = "caution" + lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' force = 1.0 throwforce = 3.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index ee2dabd2a9b..3c7aadda7d2 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -23,6 +23,8 @@ * Utensils */ /obj/item/kitchen/utensil + lefthand_file = 'icons/mob/inhands/utensil_lefthand.dmi' + righthand_file = 'icons/mob/inhands/utensil_righthand.dmi' force = 5.0 w_class = WEIGHT_CLASS_TINY throwforce = 0.0 diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 02d2e3c0e90..1274395757d 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -5,6 +5,8 @@ name = "mop" icon = 'icons/obj/janitor.dmi' icon_state = "mop" + lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' force = 3 throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 08851792a7c..8870841a4d8 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -32,6 +32,8 @@ icon = 'icons/obj/janitor.dmi' icon_state = "trashbag" belt_icon = "trashbag" + lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_SMALL slot_flags = null diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 58bac5a2188..004de6fd38b 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -4,6 +4,8 @@ icon_state = "jetpack" w_class = WEIGHT_CLASS_BULKY item_state = "jetpack" + lefthand_file = 'icons/mob/inhands/jetpack_lefthand.dmi' + righthand_file = 'icons/mob/inhands/jetpack_righthand.dmi' distribute_pressure = ONE_ATMOSPHERE * O2STANDARD actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization) var/gas_type = "oxygen" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 5b4076b8871..6c5794dd56a 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -10,6 +10,8 @@ LINEN BINS icon = 'icons/obj/items.dmi' icon_state = "sheet" item_state = "bedsheet" + lefthand_file = 'icons/mob/inhands/bedsheet_lefthand.dmi' + righthand_file = 'icons/mob/inhands/bedsheet_righthand.dmi' layer = 4 throwforce = 1 throw_speed = 1 @@ -24,8 +26,6 @@ LINEN BINS var/list/nightmare_messages = list("black") var/comfort = 0.5 - - /obj/item/bedsheet/attack_self(mob/user as mob) user.drop_item() if(layer == initial(layer)) @@ -180,7 +180,6 @@ LINEN BINS dream_messages = list("authority", "a silvery ID", "handcuffs", "a baton", "a flashbang", "sunglasses", "the head of security") nightmare_messages = list("the clown", "a toolbox", "sHiTcUrItY", "why did you put them in for 50 minutes") - /obj/item/bedsheet/hop name = "head of personnel's bedsheet" desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio." @@ -242,7 +241,6 @@ LINEN BINS dream_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure") nightmare_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure") - /obj/item/bedsheet/wiz name = "wizard's bedsheet" desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!" @@ -252,8 +250,6 @@ LINEN BINS dream_messages = list("a book", "an explosion", "lightning", "a staff", "a skeleton", "a robe", "magic") nightmare_messages = list("a toolbox", "solars") - - /obj/structure/bedsheetbin name = "linen bin" desc = "A linen bin. It looks rather cosy." diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 1612c393f07..728c1f7ecc7 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -8,6 +8,8 @@ /obj/item/stack/ore name = "rock" icon = 'icons/obj/stacks/ores.dmi' + lefthand_file = 'icons/mob/inhands/ore_lefthand.dmi' + righthand_file = 'icons/mob/inhands/ore_righthand.dmi' icon_state = "ore" max_amount = 50 singular_name = "ore chunk" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 94f51185e39..20bef90da79 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -113,6 +113,8 @@ /obj/item/reagent_containers/spray/cleaner name = "space cleaner" desc = "Your standard spritz cleaner bottle designed to keep ALL of your workplaces spotless." + lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' spray_maxrange = 2 spray_currentrange = 2 amount_per_transfer_from_this = 10 diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 81375626847..0af9ada2214 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(bluespace_crystal_recipes, list(new/datum/stack_recipe("Breakdo /obj/item/stack/sheet/bluespace_crystal name = "bluespace polycrystal" icon_state = "bluespace_crystal" - item_state = "bluespace_crystal" + item_state = "polycrystal" desc = "A stable polycrystal, made of fused-together bluespace crystals. You could probably break one off." origin_tech = "bluespace=6;materials=3" merge_type = /obj/item/stack/sheet/bluespace_crystal diff --git a/icons/mob/inhands/bedsheet_lefthand.dmi b/icons/mob/inhands/bedsheet_lefthand.dmi new file mode 100644 index 00000000000..1b9b16d7897 Binary files /dev/null and b/icons/mob/inhands/bedsheet_lefthand.dmi differ diff --git a/icons/mob/inhands/bedsheet_righthand.dmi b/icons/mob/inhands/bedsheet_righthand.dmi new file mode 100644 index 00000000000..2407ad6deab Binary files /dev/null and b/icons/mob/inhands/bedsheet_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/custodial_lefthand.dmi b/icons/mob/inhands/equipment/custodial_lefthand.dmi index 0714e446bee..2367540f0e1 100644 Binary files a/icons/mob/inhands/equipment/custodial_lefthand.dmi and b/icons/mob/inhands/equipment/custodial_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/custodial_righthand.dmi b/icons/mob/inhands/equipment/custodial_righthand.dmi index 7802b8604c4..9c7d8be238a 100644 Binary files a/icons/mob/inhands/equipment/custodial_righthand.dmi and b/icons/mob/inhands/equipment/custodial_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 69607b4e36d..25c674420b4 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 3fc76290c4c..b2ef6a88e84 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/inhands/jetpack_lefthand.dmi b/icons/mob/inhands/jetpack_lefthand.dmi new file mode 100644 index 00000000000..4778b326ac7 Binary files /dev/null and b/icons/mob/inhands/jetpack_lefthand.dmi differ diff --git a/icons/mob/inhands/jetpack_righthand.dmi b/icons/mob/inhands/jetpack_righthand.dmi new file mode 100644 index 00000000000..cdbecf6d187 Binary files /dev/null and b/icons/mob/inhands/jetpack_righthand.dmi differ diff --git a/icons/mob/inhands/ore_lefthand.dmi b/icons/mob/inhands/ore_lefthand.dmi new file mode 100644 index 00000000000..6667b15f671 Binary files /dev/null and b/icons/mob/inhands/ore_lefthand.dmi differ diff --git a/icons/mob/inhands/ore_righthand.dmi b/icons/mob/inhands/ore_righthand.dmi new file mode 100644 index 00000000000..f63067786d8 Binary files /dev/null and b/icons/mob/inhands/ore_righthand.dmi differ diff --git a/icons/mob/inhands/sheet_lefthand.dmi b/icons/mob/inhands/sheet_lefthand.dmi new file mode 100644 index 00000000000..54da11d53cd Binary files /dev/null and b/icons/mob/inhands/sheet_lefthand.dmi differ diff --git a/icons/mob/inhands/sheet_righthand.dmi b/icons/mob/inhands/sheet_righthand.dmi new file mode 100644 index 00000000000..fcf36e763e6 Binary files /dev/null and b/icons/mob/inhands/sheet_righthand.dmi differ diff --git a/icons/mob/inhands/utensil_lefthand.dmi b/icons/mob/inhands/utensil_lefthand.dmi new file mode 100644 index 00000000000..3883d10cf08 Binary files /dev/null and b/icons/mob/inhands/utensil_lefthand.dmi differ diff --git a/icons/mob/inhands/utensil_righthand.dmi b/icons/mob/inhands/utensil_righthand.dmi new file mode 100644 index 00000000000..1bf528ac554 Binary files /dev/null and b/icons/mob/inhands/utensil_righthand.dmi differ