Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
Blundir committed Dec 11, 2024
1 parent 678b7d1 commit 883c05b
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 7 deletions.
4 changes: 4 additions & 0 deletions code/game/objects/items/devices/portable_vendor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
name = "\improper Automated Storage Briefcase"
desc = "A suitcase-sized automated storage and retrieval system. Designed to efficiently store and selectively dispense small items."
icon = 'icons/obj/items/storage/briefcases.dmi'
item_icons = list(
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/storage_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/storage_righthand.dmi',
)
icon_state = "secure"
flags_atom = FPRINT|CONDUCT
force = 8
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/props/helmetgarb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@
name = "compass"
desc = "It always faces north. Are you sure it is not broken?"
icon = 'icons/obj/items/tools.dmi'
icon_state = "compass"
item_icons = list(
WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi',
)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/smartpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
icon_state = "smartpack"
icon = 'icons/obj/items/clothing/backpack/smartpack.dmi'
item_icons = list(
WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi'
WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/smartpack.dmi'
)
flags_atom = FPRINT|NO_GAMEMODE_SKIN // same sprite for all gamemodes
max_storage_space = 14
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/weapons/swords_axes_etc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
name = "telescopic baton"
desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded. It will knock down humans when not on harm intent."
icon = 'icons/obj/items/weapons/melee/non_lethal.dmi'
item_icons = list(
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/non_lethal_righthand.dmi'
)
icon_state = "telebaton_0"
item_state = "telebaton_0"
flags_equip_slot = SLOT_WAIST
Expand Down
12 changes: 6 additions & 6 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
icon_state = "band2"
icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
item_icons = list(
WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
)
flags_atom = null

Expand Down Expand Up @@ -123,7 +123,7 @@
icon_state = "berettan"
icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
item_icons = list(
WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
)

/obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...)
Expand Down Expand Up @@ -210,7 +210,7 @@
icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
item_icons = list(
WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/headbands.dmi',
)
item_state_slots = list(WEAR_AS_GARB = "headbandgreen")
Expand Down Expand Up @@ -394,7 +394,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
icon_state = "cap"
icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
item_icons = list(
WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
)
Expand Down Expand Up @@ -674,7 +674,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
icon_state = "coberet"
icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
item_icons = list(
WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi'
)
black_market_value = 30

Expand Down Expand Up @@ -976,7 +976,7 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi'
flags_inv_hide = HIDETOPHAIR
item_icons = list(
WEAR_HEAD = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi',
WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi',
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi'
)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/suits/labcoat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@
name = "snow suit"
desc = "A standard snow suit. It can protect the wearer from extreme cold."
icon = 'icons/obj/items/clothing/suits/coats_robes.dmi'
item_icons = list(
WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi',
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi',
)
icon_state = "snowsuit"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS
Expand Down
5 changes: 5 additions & 0 deletions code/modules/cm_marines/m2c.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
w_class = SIZE_HUGE
flags_equip_slot = SLOT_BACK
icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/machineguns.dmi'
item_icons = list(
WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/machineguns.dmi',
WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_lefthand.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/machineguns_righthand.dmi'
)
icon_state = "M2C_gun_mount"
item_state = "M2C_gun_mount"
var/rounds = 0
Expand Down
Binary file modified icons/mob/xenonids/Effects.dmi
Binary file not shown.
Binary file modified icons/mob/xenos/effects.dmi
Binary file not shown.

0 comments on commit 883c05b

Please sign in to comment.