Skip to content

Commit

Permalink
NewModular_New_Wallet
Browse files Browse the repository at this point in the history
Перенёс этот кал в модуль. Поправил ошибку с наименованием при помещении карты в кошелёк. Добавил в корневой файл кошельков три переменные, для упрощения добавления новых кошельков.
  • Loading branch information
Sivirus committed Dec 3, 2023
1 parent 0e0741f commit dfbdf11
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
7 changes: 4 additions & 3 deletions code/game/objects/items/weapons/storage/wallets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
slot_flags = SLOT_FLAG_ID

var/obj/item/card/id/front_id = null
var/photo_overlay = "photo" //edit ss220

// allows for clicking of stuff on our person/on the ground to put in the wallet, so easy to stick your ID in your wallet
use_to_pickup = TRUE
Expand Down Expand Up @@ -69,7 +70,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") //edit ss220

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

/obj/item/storage/wallet/update_name(updates)
. = ..()
if(front_id)
name = "wallet displaying [front_id]"
name = "[name] displaying [front_id]" //edit ss220
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 @@ -8,3 +8,4 @@
#include "code/under.dm"
#include "code/cloaks.dm"
#include "code/garment_bag.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/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 dfbdf11

Please sign in to comment.