Moving some in hand icons to different files (#20748)

* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
This commit is contained in:
Henri215
2023-04-25 21:13:02 +02:00
committed by GitHub
parent 1e3d1dc6d6
commit 6826d2ba7b
24 changed files with 19 additions and 7 deletions
@@ -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
@@ -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
@@ -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
+2
View File
@@ -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
@@ -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
@@ -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"
+2 -6
View File
@@ -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."
+2
View File
@@ -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"
@@ -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
+1 -1
View File
@@ -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
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 883 B

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 KiB

After

Width:  |  Height:  |  Size: 178 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 480 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B