diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index ed07cd302db..53407f2c9c9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -568,6 +568,7 @@ BREATH ANALYZER name = "price scanner" desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy." icon_state = "price_scanner" + item_state = "price_scanner" item_flags = ITEM_FLAG_NO_BLUDGEON slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index d9d698e011b..ba531c42432 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -801,9 +801,9 @@ name = "crate contents scanner" desc = "A handheld device used to scan and print a manifest of a container's contents. Does not work on locked crates, for privacy reasons." icon_state = "cratescanner" + item_state = "cratescanner" matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140) w_class = ITEMSIZE_SMALL - item_state = "electronic" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ccdc12951f3..ed97e071790 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -251,10 +251,10 @@ name = "destination tagger" desc = "Used to set the destination of properly wrapped packages." icon_state = "dest_tagger" + item_state = "dest_tagger" var/currTag = 0 matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140) w_class = ITEMSIZE_SMALL - item_state = "electronic" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT diff --git a/html/changelogs/Stev-the-third-dagamuir.yml b/html/changelogs/Stev-the-third-dagamuir.yml new file mode 100644 index 00000000000..a2f703d9c43 --- /dev/null +++ b/html/changelogs/Stev-the-third-dagamuir.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Stev-the-third + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds inhand sprites for the price scanner, destination tagger and crate scanner." + - imageadd: "Adds new worn sprites for the Dagamuir suit and Sinta Tunic" + - imageadd: "Adds a new inhand sprite for the Xenofauna blaster, to be in line with other sprites at a 45 degree angle." diff --git a/icons/mob/items/device/lefthand_device.dmi b/icons/mob/items/device/lefthand_device.dmi index 1d675217314..6d7d030aa07 100644 Binary files a/icons/mob/items/device/lefthand_device.dmi and b/icons/mob/items/device/lefthand_device.dmi differ diff --git a/icons/mob/items/device/righthand_device.dmi b/icons/mob/items/device/righthand_device.dmi index 0cbd0d21374..b8a73fea8c6 100644 Binary files a/icons/mob/items/device/righthand_device.dmi and b/icons/mob/items/device/righthand_device.dmi differ diff --git a/icons/obj/guns/xenogun.dmi b/icons/obj/guns/xenogun.dmi index 3c034a17d8c..67d6922b8bb 100644 Binary files a/icons/obj/guns/xenogun.dmi and b/icons/obj/guns/xenogun.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/security.dmi b/icons/obj/item/clothing/department_uniforms/security.dmi index f5a5cf21fd8..da77478b2c6 100644 Binary files a/icons/obj/item/clothing/department_uniforms/security.dmi and b/icons/obj/item/clothing/department_uniforms/security.dmi differ diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 155a436b375..b1525fb24ef 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ