Skip to content

Commit

Permalink
New_Wallets_3
Browse files Browse the repository at this point in the history
Исправил конфликт, поправил спрайт и перенёс переменную в модуль
  • Loading branch information
Sivirus committed Dec 3, 2023
1 parent 85de728 commit 741556d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/game/objects/items/weapons/storage/wallets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
return
. += mutable_appearance(front_id.icon, front_id.icon_state)
. += front_id.overlays
. += mutable_appearance(icon, "wallet_overlay")
. += mutable_appearance(icon, "[icon_state]_overlay") // SS220 EDIT

// fuck yeah, ass photo in my wallet
var/obj/item/photo/photo = locate(/obj/item/photo) in contents
Expand All @@ -79,12 +79,12 @@
MA.pixel_x = 11
MA.pixel_y = 1
. += MA
. += mutable_appearance(icon, "photo_overlay")
. += mutable_appearance(icon, "[photo_overlay]_overlay") // SS220 EDIT

/obj/item/storage/wallet/update_name(updates)
. = ..()
if(front_id)
name = "wallet displaying [front_id]"
name = "[name] displaying [front_id]" // SS220 EDIT
else
name = initial(name)

Expand Down
1 change: 1 addition & 0 deletions modular_ss220/clothing/_clothing.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
#include "code/cloaks.dm"
#include "code/garment_bag.dm"
#include "code/hev_suit.dm"
#include "code/wallets.dm"
22 changes: 22 additions & 0 deletions modular_ss220/clothing/code/wallets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/obj/item/storage/wallet
var/photo_overlay = "photo"
/obj/item/storage/wallet/wallet_NT
name = "leather wallet NT"
desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе."
icon = 'modular_ss220/clothing/icons/object/wallets.dmi'
icon_state = "wallet_NT"
photo_overlay = "photo_NT"

/obj/item/storage/wallet/wallet_USSP_1
name = "leather wallet USSP"
desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
icon = 'modular_ss220/clothing/icons/object/wallets.dmi'
icon_state = "wallet_USSP_1"
photo_overlay = "photo_USSP"

/obj/item/storage/wallet/wallet_USSP_2
name = "leather wallet USSP"
desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
icon = 'modular_ss220/clothing/icons/object/wallets.dmi'
icon_state = "wallet_USSP_2"
photo_overlay = "photo_USSP"
Binary file added modular_ss220/clothing/icons/object/wallets.dmi
Binary file not shown.

0 comments on commit 741556d

Please sign in to comment.