From 4242c09941d01df42c8e714204c5fd46217c979b Mon Sep 17 00:00:00 2001 From: Sivirus Date: Thu, 16 Nov 2023 19:12:28 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Сделал спрайты кошелька НТ и СССП. Плюс добавил их в игру. --- .../objects/items/weapons/storage/wallets.dm | 381 ++++++++++++++++++ icons/obj/wallets.dmi | Bin 1159 -> 3456 bytes 2 files changed, 381 insertions(+) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index d38608a45eb8..b11adad5b42e 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -119,3 +119,384 @@ name = "cheap wallet" desc = "A cheap and flimsy wallet from the arcade." storage_slots = 5 //smaller storage than normal wallets + + + + + + +/obj/item/storage/wallet_NT //Кошель НТ, ща насру + name = "leather wallet NT" //Название сменил + desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." //Описание от Муни. + storage_slots = 10 + icon = 'icons/obj/wallets.dmi' + icon_state = "wallet_NT" //Иконка. + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + can_hold = list( + /obj/item/stack/spacecash, + /obj/item/card, + /obj/item/clothing/mask/cigarette, + /obj/item/flashlight/pen, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/toy/crayon, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/lighter, + /obj/item/match, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/screwdriver, + /obj/item/stamp) + cant_hold = list( + /obj/item/screwdriver/power + ) + slot_flags = SLOT_FLAG_ID + + var/obj/item/card/id/front_id = null + + // 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 + pickup_all_on_tile = FALSE + + +/obj/item/storage/wallet_NT/remove_from_storage(obj/item/I, atom/new_location) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + +/obj/item/storage/wallet_NT/handle_item_insertion(obj/item/I, prevent_warning = FALSE) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + +/obj/item/storage/wallet_NT/orient2hud(mob/user) + . = ..() + refresh_ID() + +/obj/item/storage/wallet_NT/proc/refresh_ID() + // Locate the first ID in the wallet + front_id = (locate(/obj/item/card/id) in contents) + + if(ishuman(loc)) + var/mob/living/carbon/human/wearing_human = loc + if(wearing_human.wear_id == src) + wearing_human.sec_hud_set_ID() + + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) + +/obj/item/storage/wallet_NT/update_overlays() + . = ..() + if(!front_id) + return + . += mutable_appearance(front_id.icon, front_id.icon_state) + . += front_id.overlays + . += mutable_appearance(icon, "wallet_overlay_NT") + + // fuck yeah, ass photo in my wallet + var/obj/item/photo/photo = locate(/obj/item/photo) in contents + if(!photo) + return + var/mutable_appearance/MA = mutable_appearance(photo.appearance) + MA.pixel_x = 11 + MA.pixel_y = 1 + . += MA + . += mutable_appearance(icon, "photo_overlay_NT") + +/obj/item/storage/wallet_NT/update_name(updates) + . = ..() + if(front_id) + name = "wallet displaying [front_id]" + else + name = initial(name) + +/obj/item/storage/wallet_NT/GetID() + return front_id + +/obj/item/storage/wallet_NT/GetAccess() + var/obj/item/I = GetID() + if(I) + return I.GetAccess() + else + return ..() + +/obj/item/storage/wallet_NT/random/populate_contents() + var/cash = pick(/obj/item/stack/spacecash, + /obj/item/stack/spacecash/c5, + /obj/item/stack/spacecash/c10, + /obj/item/stack/spacecash/c50, + /obj/item/stack/spacecash/c100) + var/coin = pickweight(list(/obj/item/coin/iron = 3, + /obj/item/coin/silver = 2, + /obj/item/coin/gold = 1)) + + new cash(src) + if(prob(50)) // 50% chance of a second + new cash(src) + new coin(src) + + +// Arcade Wallet +//obj/item/storage/wallet_NT/cheap + //name = "cheap wallet" + //desc = "A cheap and flimsy wallet from the arcade." + //storage_slots = 5 //smaller storage than normal wallets + + + + + + +/obj/item/storage/wallet_USSP_1 + name = "leather wallet USSP" + desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." + storage_slots = 10 + icon = 'icons/obj/wallets.dmi' + icon_state = "wallet_USSP_1" + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + can_hold = list( + /obj/item/stack/spacecash, + /obj/item/card, + /obj/item/clothing/mask/cigarette, + /obj/item/flashlight/pen, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/toy/crayon, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/lighter, + /obj/item/match, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/screwdriver, + /obj/item/stamp) + cant_hold = list( + /obj/item/screwdriver/power + ) + slot_flags = SLOT_FLAG_ID + + var/obj/item/card/id/front_id = null + + // 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 + pickup_all_on_tile = FALSE + + +/obj/item/storage/wallet_USSP_1/remove_from_storage(obj/item/I, atom/new_location) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + +/obj/item/storage/wallet_USSP_1/handle_item_insertion(obj/item/I, prevent_warning = FALSE) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + +/obj/item/storage/wallet_USSP_1/orient2hud(mob/user) + . = ..() + refresh_ID() + +/obj/item/storage/wallet_USSP_1/proc/refresh_ID() + // Locate the first ID in the wallet + front_id = (locate(/obj/item/card/id) in contents) + + if(ishuman(loc)) + var/mob/living/carbon/human/wearing_human = loc + if(wearing_human.wear_id == src) + wearing_human.sec_hud_set_ID() + + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) + +/obj/item/storage/wallet_USSP_1/update_overlays() + . = ..() + if(!front_id) + return + . += mutable_appearance(front_id.icon, front_id.icon_state) + . += front_id.overlays + . += mutable_appearance(icon, "wallet_overlay_USSP") + + // fuck yeah, ass photo in my wallet + var/obj/item/photo/photo = locate(/obj/item/photo) in contents + if(!photo) + return + var/mutable_appearance/MA = mutable_appearance(photo.appearance) + MA.pixel_x = 11 + MA.pixel_y = 1 + . += MA + . += mutable_appearance(icon, "photo_overlay_USSP") + +/obj/item/storage/wallet_USSP_1/update_name(updates) + . = ..() + if(front_id) + name = "wallet displaying [front_id]" + else + name = initial(name) + +/obj/item/storage/wallet_USSP_1/GetID() + return front_id + +/obj/item/storage/wallet_USSP_1/GetAccess() + var/obj/item/I = GetID() + if(I) + return I.GetAccess() + else + return ..() + +/obj/item/storage/wallet_USSP_1/random/populate_contents() + var/cash = pick(/obj/item/stack/spacecash, + /obj/item/stack/spacecash/c5, + /obj/item/stack/spacecash/c10, + /obj/item/stack/spacecash/c50, + /obj/item/stack/spacecash/c100) + var/coin = pickweight(list(/obj/item/coin/iron = 3, + /obj/item/coin/silver = 2, + /obj/item/coin/gold = 1)) + + new cash(src) + if(prob(50)) // 50% chance of a second + new cash(src) + new coin(src) + + +// Arcade Wallet +//obj/item/storage/wallet_USSP_1/cheap + //name = "cheap wallet" + //desc = "A cheap and flimsy wallet from the arcade." + //storage_slots = 5 //smaller storage than normal wallets + + + + + + +/obj/item/storage/wallet_USSP_2 + name = "leather wallet USSP" + desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." + storage_slots = 10 + icon = 'icons/obj/wallets.dmi' + icon_state = "wallet_USSP_2" + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + can_hold = list( + /obj/item/stack/spacecash, + /obj/item/card, + /obj/item/clothing/mask/cigarette, + /obj/item/flashlight/pen, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/toy/crayon, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/lighter, + /obj/item/match, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/screwdriver, + /obj/item/stamp) + cant_hold = list( + /obj/item/screwdriver/power + ) + slot_flags = SLOT_FLAG_ID + + var/obj/item/card/id/front_id = null + + // 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 + pickup_all_on_tile = FALSE + + +/obj/item/storage/wallet_USSP_2/remove_from_storage(obj/item/I, atom/new_location) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + +/obj/item/storage/wallet_USSP_2/handle_item_insertion(obj/item/I, prevent_warning = FALSE) + . = ..() + if(. && istype(I, /obj/item/card/id)) + refresh_ID() + +/obj/item/storage/wallet_USSP_2/orient2hud(mob/user) + . = ..() + refresh_ID() + +/obj/item/storage/wallet_USSP_2/proc/refresh_ID() + // Locate the first ID in the wallet + front_id = (locate(/obj/item/card/id) in contents) + + if(ishuman(loc)) + var/mob/living/carbon/human/wearing_human = loc + if(wearing_human.wear_id == src) + wearing_human.sec_hud_set_ID() + + update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) + +/obj/item/storage/wallet_USSP_2/update_overlays() + . = ..() + if(!front_id) + return + . += mutable_appearance(front_id.icon, front_id.icon_state) + . += front_id.overlays + . += mutable_appearance(icon, "wallet_overlay_USSP") + + // fuck yeah, ass photo in my wallet + var/obj/item/photo/photo = locate(/obj/item/photo) in contents + if(!photo) + return + var/mutable_appearance/MA = mutable_appearance(photo.appearance) + MA.pixel_x = 11 + MA.pixel_y = 1 + . += MA + . += mutable_appearance(icon, "photo_overlay_USSP") + +/obj/item/storage/wallet_USSP_2/update_name(updates) + . = ..() + if(front_id) + name = "wallet displaying [front_id]" + else + name = initial(name) + +/obj/item/storage/wallet_USSP_2/GetID() + return front_id + +/obj/item/storage/wallet_USSP_2/GetAccess() + var/obj/item/I = GetID() + if(I) + return I.GetAccess() + else + return ..() + +/obj/item/storage/wallet_USSP_2/random/populate_contents() + var/cash = pick(/obj/item/stack/spacecash, + /obj/item/stack/spacecash/c5, + /obj/item/stack/spacecash/c10, + /obj/item/stack/spacecash/c50, + /obj/item/stack/spacecash/c100) + var/coin = pickweight(list(/obj/item/coin/iron = 3, + /obj/item/coin/silver = 2, + /obj/item/coin/gold = 1)) + + new cash(src) + if(prob(50)) // 50% chance of a second + new cash(src) + new coin(src) + + +// Arcade Wallet +//obj/item/storage/wallet_USSP_2/cheap + //name = "cheap wallet" + //desc = "A cheap and flimsy wallet from the arcade." + //storage_slots = 5 //smaller storage than normal wallets \ No newline at end of file diff --git a/icons/obj/wallets.dmi b/icons/obj/wallets.dmi index a6d8d66b910e5fbd338286f3f05ebc6cccf65551..f04f14ea8db5361ac9d22b865bd96f035ba4ed86 100644 GIT binary patch literal 3456 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 Z{{ZhW7Fp Date: Sun, 3 Dec 2023 15:56:29 +0300 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=D0=9A=D0=BE=D1=88=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4242c09941d01df42c8e714204c5fd46217c979b. --- .../objects/items/weapons/storage/wallets.dm | 381 ------------------ icons/obj/wallets.dmi | Bin 3456 -> 1159 bytes 2 files changed, 381 deletions(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index b11adad5b42e..d38608a45eb8 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -119,384 +119,3 @@ name = "cheap wallet" desc = "A cheap and flimsy wallet from the arcade." storage_slots = 5 //smaller storage than normal wallets - - - - - - -/obj/item/storage/wallet_NT //Кошель НТ, ща насру - name = "leather wallet NT" //Название сменил - desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." //Описание от Муни. - storage_slots = 10 - icon = 'icons/obj/wallets.dmi' - icon_state = "wallet_NT" //Иконка. - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE - can_hold = list( - /obj/item/stack/spacecash, - /obj/item/card, - /obj/item/clothing/mask/cigarette, - /obj/item/flashlight/pen, - /obj/item/seeds, - /obj/item/stack/medical, - /obj/item/toy/crayon, - /obj/item/coin, - /obj/item/dice, - /obj/item/disk, - /obj/item/implanter, - /obj/item/lighter, - /obj/item/match, - /obj/item/paper, - /obj/item/pen, - /obj/item/photo, - /obj/item/reagent_containers/dropper, - /obj/item/screwdriver, - /obj/item/stamp) - cant_hold = list( - /obj/item/screwdriver/power - ) - slot_flags = SLOT_FLAG_ID - - var/obj/item/card/id/front_id = null - - // 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 - pickup_all_on_tile = FALSE - - -/obj/item/storage/wallet_NT/remove_from_storage(obj/item/I, atom/new_location) - . = ..() - if(. && istype(I, /obj/item/card/id)) - refresh_ID() - -/obj/item/storage/wallet_NT/handle_item_insertion(obj/item/I, prevent_warning = FALSE) - . = ..() - if(. && istype(I, /obj/item/card/id)) - refresh_ID() - -/obj/item/storage/wallet_NT/orient2hud(mob/user) - . = ..() - refresh_ID() - -/obj/item/storage/wallet_NT/proc/refresh_ID() - // Locate the first ID in the wallet - front_id = (locate(/obj/item/card/id) in contents) - - if(ishuman(loc)) - var/mob/living/carbon/human/wearing_human = loc - if(wearing_human.wear_id == src) - wearing_human.sec_hud_set_ID() - - update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) - -/obj/item/storage/wallet_NT/update_overlays() - . = ..() - if(!front_id) - return - . += mutable_appearance(front_id.icon, front_id.icon_state) - . += front_id.overlays - . += mutable_appearance(icon, "wallet_overlay_NT") - - // fuck yeah, ass photo in my wallet - var/obj/item/photo/photo = locate(/obj/item/photo) in contents - if(!photo) - return - var/mutable_appearance/MA = mutable_appearance(photo.appearance) - MA.pixel_x = 11 - MA.pixel_y = 1 - . += MA - . += mutable_appearance(icon, "photo_overlay_NT") - -/obj/item/storage/wallet_NT/update_name(updates) - . = ..() - if(front_id) - name = "wallet displaying [front_id]" - else - name = initial(name) - -/obj/item/storage/wallet_NT/GetID() - return front_id - -/obj/item/storage/wallet_NT/GetAccess() - var/obj/item/I = GetID() - if(I) - return I.GetAccess() - else - return ..() - -/obj/item/storage/wallet_NT/random/populate_contents() - var/cash = pick(/obj/item/stack/spacecash, - /obj/item/stack/spacecash/c5, - /obj/item/stack/spacecash/c10, - /obj/item/stack/spacecash/c50, - /obj/item/stack/spacecash/c100) - var/coin = pickweight(list(/obj/item/coin/iron = 3, - /obj/item/coin/silver = 2, - /obj/item/coin/gold = 1)) - - new cash(src) - if(prob(50)) // 50% chance of a second - new cash(src) - new coin(src) - - -// Arcade Wallet -//obj/item/storage/wallet_NT/cheap - //name = "cheap wallet" - //desc = "A cheap and flimsy wallet from the arcade." - //storage_slots = 5 //smaller storage than normal wallets - - - - - - -/obj/item/storage/wallet_USSP_1 - name = "leather wallet USSP" - desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." - storage_slots = 10 - icon = 'icons/obj/wallets.dmi' - icon_state = "wallet_USSP_1" - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE - can_hold = list( - /obj/item/stack/spacecash, - /obj/item/card, - /obj/item/clothing/mask/cigarette, - /obj/item/flashlight/pen, - /obj/item/seeds, - /obj/item/stack/medical, - /obj/item/toy/crayon, - /obj/item/coin, - /obj/item/dice, - /obj/item/disk, - /obj/item/implanter, - /obj/item/lighter, - /obj/item/match, - /obj/item/paper, - /obj/item/pen, - /obj/item/photo, - /obj/item/reagent_containers/dropper, - /obj/item/screwdriver, - /obj/item/stamp) - cant_hold = list( - /obj/item/screwdriver/power - ) - slot_flags = SLOT_FLAG_ID - - var/obj/item/card/id/front_id = null - - // 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 - pickup_all_on_tile = FALSE - - -/obj/item/storage/wallet_USSP_1/remove_from_storage(obj/item/I, atom/new_location) - . = ..() - if(. && istype(I, /obj/item/card/id)) - refresh_ID() - -/obj/item/storage/wallet_USSP_1/handle_item_insertion(obj/item/I, prevent_warning = FALSE) - . = ..() - if(. && istype(I, /obj/item/card/id)) - refresh_ID() - -/obj/item/storage/wallet_USSP_1/orient2hud(mob/user) - . = ..() - refresh_ID() - -/obj/item/storage/wallet_USSP_1/proc/refresh_ID() - // Locate the first ID in the wallet - front_id = (locate(/obj/item/card/id) in contents) - - if(ishuman(loc)) - var/mob/living/carbon/human/wearing_human = loc - if(wearing_human.wear_id == src) - wearing_human.sec_hud_set_ID() - - update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) - -/obj/item/storage/wallet_USSP_1/update_overlays() - . = ..() - if(!front_id) - return - . += mutable_appearance(front_id.icon, front_id.icon_state) - . += front_id.overlays - . += mutable_appearance(icon, "wallet_overlay_USSP") - - // fuck yeah, ass photo in my wallet - var/obj/item/photo/photo = locate(/obj/item/photo) in contents - if(!photo) - return - var/mutable_appearance/MA = mutable_appearance(photo.appearance) - MA.pixel_x = 11 - MA.pixel_y = 1 - . += MA - . += mutable_appearance(icon, "photo_overlay_USSP") - -/obj/item/storage/wallet_USSP_1/update_name(updates) - . = ..() - if(front_id) - name = "wallet displaying [front_id]" - else - name = initial(name) - -/obj/item/storage/wallet_USSP_1/GetID() - return front_id - -/obj/item/storage/wallet_USSP_1/GetAccess() - var/obj/item/I = GetID() - if(I) - return I.GetAccess() - else - return ..() - -/obj/item/storage/wallet_USSP_1/random/populate_contents() - var/cash = pick(/obj/item/stack/spacecash, - /obj/item/stack/spacecash/c5, - /obj/item/stack/spacecash/c10, - /obj/item/stack/spacecash/c50, - /obj/item/stack/spacecash/c100) - var/coin = pickweight(list(/obj/item/coin/iron = 3, - /obj/item/coin/silver = 2, - /obj/item/coin/gold = 1)) - - new cash(src) - if(prob(50)) // 50% chance of a second - new cash(src) - new coin(src) - - -// Arcade Wallet -//obj/item/storage/wallet_USSP_1/cheap - //name = "cheap wallet" - //desc = "A cheap and flimsy wallet from the arcade." - //storage_slots = 5 //smaller storage than normal wallets - - - - - - -/obj/item/storage/wallet_USSP_2 - name = "leather wallet USSP" - desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." - storage_slots = 10 - icon = 'icons/obj/wallets.dmi' - icon_state = "wallet_USSP_2" - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE - can_hold = list( - /obj/item/stack/spacecash, - /obj/item/card, - /obj/item/clothing/mask/cigarette, - /obj/item/flashlight/pen, - /obj/item/seeds, - /obj/item/stack/medical, - /obj/item/toy/crayon, - /obj/item/coin, - /obj/item/dice, - /obj/item/disk, - /obj/item/implanter, - /obj/item/lighter, - /obj/item/match, - /obj/item/paper, - /obj/item/pen, - /obj/item/photo, - /obj/item/reagent_containers/dropper, - /obj/item/screwdriver, - /obj/item/stamp) - cant_hold = list( - /obj/item/screwdriver/power - ) - slot_flags = SLOT_FLAG_ID - - var/obj/item/card/id/front_id = null - - // 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 - pickup_all_on_tile = FALSE - - -/obj/item/storage/wallet_USSP_2/remove_from_storage(obj/item/I, atom/new_location) - . = ..() - if(. && istype(I, /obj/item/card/id)) - refresh_ID() - -/obj/item/storage/wallet_USSP_2/handle_item_insertion(obj/item/I, prevent_warning = FALSE) - . = ..() - if(. && istype(I, /obj/item/card/id)) - refresh_ID() - -/obj/item/storage/wallet_USSP_2/orient2hud(mob/user) - . = ..() - refresh_ID() - -/obj/item/storage/wallet_USSP_2/proc/refresh_ID() - // Locate the first ID in the wallet - front_id = (locate(/obj/item/card/id) in contents) - - if(ishuman(loc)) - var/mob/living/carbon/human/wearing_human = loc - if(wearing_human.wear_id == src) - wearing_human.sec_hud_set_ID() - - update_appearance(UPDATE_NAME|UPDATE_OVERLAYS) - -/obj/item/storage/wallet_USSP_2/update_overlays() - . = ..() - if(!front_id) - return - . += mutable_appearance(front_id.icon, front_id.icon_state) - . += front_id.overlays - . += mutable_appearance(icon, "wallet_overlay_USSP") - - // fuck yeah, ass photo in my wallet - var/obj/item/photo/photo = locate(/obj/item/photo) in contents - if(!photo) - return - var/mutable_appearance/MA = mutable_appearance(photo.appearance) - MA.pixel_x = 11 - MA.pixel_y = 1 - . += MA - . += mutable_appearance(icon, "photo_overlay_USSP") - -/obj/item/storage/wallet_USSP_2/update_name(updates) - . = ..() - if(front_id) - name = "wallet displaying [front_id]" - else - name = initial(name) - -/obj/item/storage/wallet_USSP_2/GetID() - return front_id - -/obj/item/storage/wallet_USSP_2/GetAccess() - var/obj/item/I = GetID() - if(I) - return I.GetAccess() - else - return ..() - -/obj/item/storage/wallet_USSP_2/random/populate_contents() - var/cash = pick(/obj/item/stack/spacecash, - /obj/item/stack/spacecash/c5, - /obj/item/stack/spacecash/c10, - /obj/item/stack/spacecash/c50, - /obj/item/stack/spacecash/c100) - var/coin = pickweight(list(/obj/item/coin/iron = 3, - /obj/item/coin/silver = 2, - /obj/item/coin/gold = 1)) - - new cash(src) - if(prob(50)) // 50% chance of a second - new cash(src) - new coin(src) - - -// Arcade Wallet -//obj/item/storage/wallet_USSP_2/cheap - //name = "cheap wallet" - //desc = "A cheap and flimsy wallet from the arcade." - //storage_slots = 5 //smaller storage than normal wallets \ No newline at end of file diff --git a/icons/obj/wallets.dmi b/icons/obj/wallets.dmi index f04f14ea8db5361ac9d22b865bd96f035ba4ed86..a6d8d66b910e5fbd338286f3f05ebc6cccf65551 100644 GIT binary patch literal 1159 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 KgHk Date: Sun, 3 Dec 2023 16:45:07 +0300 Subject: [PATCH 3/4] NewModular_New_Wallet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Перенёс этот кал в модуль. Поправил ошибку с наименованием при помещении карты в кошелёк. Добавил в корневой файл кошельков три переменные, для упрощения добавления новых кошельков. --- .../objects/items/weapons/storage/wallets.dm | 7 +++--- modular_ss220/clothing/_clothing.dme | 1 + modular_ss220/clothing/code/wallets.dm | 22 ++++++++++++++++++ .../clothing/icons/object/wallets.dmi | Bin 0 -> 2725 bytes 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 modular_ss220/clothing/code/wallets.dm create mode 100644 modular_ss220/clothing/icons/object/wallets.dmi diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index d38608a45eb8..73762bdb22c4 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -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 @@ -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 @@ -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) diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme index 433e10db4734..d86a1752d9d6 100644 --- a/modular_ss220/clothing/_clothing.dme +++ b/modular_ss220/clothing/_clothing.dme @@ -8,3 +8,4 @@ #include "code/under.dm" #include "code/cloaks.dm" #include "code/garment_bag.dm" +#include "code/wallets.dm" diff --git a/modular_ss220/clothing/code/wallets.dm b/modular_ss220/clothing/code/wallets.dm new file mode 100644 index 000000000000..5e497a977594 --- /dev/null +++ b/modular_ss220/clothing/code/wallets.dm @@ -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" diff --git a/modular_ss220/clothing/icons/object/wallets.dmi b/modular_ss220/clothing/icons/object/wallets.dmi new file mode 100644 index 0000000000000000000000000000000000000000..bf1ac0051e6ed9634efc843b10e195c9ada0a997 GIT binary patch literal 2725 zcmai0c{JN;7yiYrsI=DFyN&4*Qer7;DXD#LF{oD2R#5AVEr=zeG)0u6)}pF*Vl7Fk zZBRO)O32TA!u&%b{DbcSKvYpKw)s#WR1(hUX^g_Zocvx0 zcRFR7Jfep&t`IgmIau+Q7&)-`bZQwLyX?OPE2_GD!OAV@ouOg&d}xPY`!-r3%z#BI z+Ke=>^40Lo_Gv8upZC|&AxW2Ng#AFx;G!pS#K%OD#WI!Ld^3W|gU!il`O}`Vr`J;1!aPxSQD5BA`8)yVXv;@M`h;8MangQ(fYI zsMm!n4YQAWzSd!v9NZ>IP7-?(P5j7^F8$|H2_cM)vh{ixk6hF3`lA_~oc0f$jUdP! zL^fwwJ!wWQk({(|qRf*J-3*~mbkKGlG@hH|7MZ}`Wm&jZ`3cQW6I{zbZ{vnwfExDx ztB;D;Ef|02{0PxVe)C3mFd9pS2Nw95YRq{vcY{Fs8ShfoW{G%3V$9~*otSBU3DIzI z0~-ep%MT#QtJXGG@8#3QBJT{H7a3Md=_#=o-wGfN_X+~2QX@s|xBH=YwbjcS`wesE zT4FRo0OFw*+K<=VwVxE&-c>p1JF4WryaBp7hW~wPvysqYZ!vq2vw_>(mxF3u;sw}2 z=T?!QVFzK+gFXdM<2IQW6FhbIRzFhnzK)DafOJSQSpMB98$SaLkjg~%XAPoI>r^Ts z&+}BnL7sKV1UYgPIRyZ^Y@}AIeUX=TT)}y{{Y$5#UNDoOE8k;x`6S+a-_^RgzG&VT z)!VE3!fFVNFal8bkJz|vPEyhI`D#6$birF=qgLKMWs|8HGo!kz?wan4GNV)4NqLFK zA2002T8(IgfNr;nB_Q;YAw$nsJlT6}XSmEi&^Z z_eO>*b4ej8?H{#H< zTi`bysfL_q@pTu5d#&YMOo4Ds}mHykyB}YR64Rq6tvaTM^nw0v`2tnc%XN*)*(K#>uzhp?@E zEN=LG*yFUj(U;?Cuya4XzzcKWHB6bgA_DM!4oWE(0H?|s%l=z%A9OjE2|l#PEAnBd z++gc4`twh{)H4s9Tk@3sE?19PzN>SpQBnTL1K4ySEVr+nl>$^I4u&695?q==0Z!NQ z3mz$P{M|=*0s7jZ!D#14Yx&(3yw0-Kr@qElmR$=}d7;b;IHrF|ax3WC1$wB)guHDl zK?Mj3e=yDJD`Ro?zrg`ghmH(iE@#=bx5WF5bqpu_EYkbT(WB4+b)eV|Q*>ISLH8~F z0Tvtm-bhzXxRdZcn1j^1*Eg)SO>;*rlWmbO^hX@)60H>zoHLP76(jMmR4%uYG991|K(k)q%Vgp- zv>{B#8@rkcdNE0wB!5QoDvZ6GPzDW-I^Xv5ui19VON;QYt-sVfQnovth{nMsl zy}c%gMA2tx%d5F7}C1OKj*jey-qRCeRuFDIGrgqs^Cd#Ygueb@6< z9}jh5@szQvhhGJ@3pcK2O&E>sr~}4`7y(w!A>z)URYTTHBX3VJDz4Y$Y^JMFp(EhR zDoT&|_Vug;#SKu?LfjYy2Rv!|CAJ?95i6f@KjI))Cl`a`$CB>pMh=gaAeV;*80 z5a8*tDYlFSXEP)8WJNb<9!$XEdw`TYxa|=SS_6(F#D|d=?mZ7bARJyc(nzepn*xzkl)? zf~k7Pp?&G)Q_Qk1W%t!jJ$$4md6>>qGSeod+3}vn3TkblWuMgoc17eWmD92&RCkP1 z3CB&PcWmo?!-;p=Dk&+nbF#iEcWU z<$JL|J(D76ZTm&&3CL-FBa*Z2&{@g9o?)MkNPOI#34gHdtuJVSrHJcnzg7LMd2Ra^ zHbyq(Jy5f@J$D6xjIV5}gQzGBrK2+_k3*Yx@7;(BBj3ujdnnm=8&ED?5o2V9k~YGX z=SZ$df{ujJpfu^EwxJP?i_+&m>g9uwjAE2EBrqxUgR9{ XtbUW|($&oUcLJ7hJF|w%H Date: Mon, 4 Dec 2023 01:02:59 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=B5=D0=BB=D0=B8=200.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../objects/items/weapons/storage/wallets.dm | 7 +++---- modular_ss220/clothing/code/wallets.dm | 4 ++-- .../clothing/icons/object/wallets.dmi | Bin 2725 -> 2722 bytes 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 73762bdb22c4..60f70ccb3bc5 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -32,7 +32,6 @@ 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 @@ -70,7 +69,7 @@ return . += mutable_appearance(front_id.icon, front_id.icon_state) . += front_id.overlays - . += mutable_appearance(icon, "[icon_state]_overlay") //edit ss220 + . += 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 @@ -80,12 +79,12 @@ MA.pixel_x = 11 MA.pixel_y = 1 . += MA - . += mutable_appearance(icon, "[photo_overlay]_overlay") //edit ss220 + . += mutable_appearance(icon, "[photo_overlay]_overlay") // SS220 EDIT /obj/item/storage/wallet/update_name(updates) . = ..() if(front_id) - name = "[name] displaying [front_id]" //edit ss220 + name = "[name] displaying [front_id]" // SS220 EDIT else name = initial(name) diff --git a/modular_ss220/clothing/code/wallets.dm b/modular_ss220/clothing/code/wallets.dm index 5e497a977594..eb5a10797499 100644 --- a/modular_ss220/clothing/code/wallets.dm +++ b/modular_ss220/clothing/code/wallets.dm @@ -1,3 +1,5 @@ +/obj/item/storage/wallet + var/photo_overlay = "photo" /obj/item/storage/wallet/wallet_NT name = "leather wallet NT" desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." @@ -5,7 +7,6 @@ icon_state = "wallet_NT" photo_overlay = "photo_NT" - /obj/item/storage/wallet/wallet_USSP_1 name = "leather wallet USSP" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." @@ -13,7 +14,6 @@ icon_state = "wallet_USSP_1" photo_overlay = "photo_USSP" - /obj/item/storage/wallet/wallet_USSP_2 name = "leather wallet USSP" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." diff --git a/modular_ss220/clothing/icons/object/wallets.dmi b/modular_ss220/clothing/icons/object/wallets.dmi index bf1ac0051e6ed9634efc843b10e195c9ada0a997..251d2b4733d1f7c5a10352eb3d857be12905eb9b 100644 GIT binary patch delta 2472 zcmZuycQo4#7ydl2xg|nHLTTU71T&-Scb?>L;9~p* zh?1W>b0CvZqE^Z($hB~LK1UImX=LGmX>M+Etu4Rhi|?!$>FEnhV5@r1J1^w(tfjBy z-Mw5NALS%|F^xOCpUYR#oRhV-#CFsiR8f!l!u6~zMW-i3VrzY6@ACo7;OEDgDIOam z{9m54v!VO+r;+nSbkrtgc8hXF_yvpLlQV&N75uQbJCw_-5?$nfoGa*|>if`)GW)?h{W2x%H++4$*2*_bvI5J`z<+<(+HmY$J)=J4MHWcs2GEor zB-*lo+mu=TBvCeMasOhJm@gvXV>bx+`=D~RIb?;NPx90F@XKH66SenIZ}>d}n2?oi zg{m_cE*K<0JPmVGiQS(Ns&B#xTLq`QWXW|yErtVxrzVlhy|syTn{g6Kd-pKZq*wAG z9h$g) zAKl0icyEcOj8$3rbcHwDN^lAa{P~NPHe*QS@aR_XG49IO=*0z`;eNtSBm9*5fdq~# zzu_dF^?Lw*y|ERaOx5goT_z)Ip?m@W@;qmky!~|k#bSdtu`~!kdCAzJobhgUgd_4-_1GcA z&+~^h{Jw2H*nB&>9h;ZIczxcy6;vtF5cE;|H&-C__r$;I-4z)8j{NBr?J>a}WoP zO@XlC+}Pej7J5M&m!qSjT9g7MdIQsZd_4+sc|z6po$6C1rh@$h%p6zIp#E-zM&>rN z61tF;Po4*}UT7%C&Z}%nHrW}u#6N_q{sUXYtWP|Mg1@t`tQcfX1Wm)Z00J)PPS(7e z8UQTC3|pH0b`BeOuQ(g${_2o!(=@;XjL84KL$vy#;ISPqWNDZ18goQtc@ZdTccKko zMw1{t{V4`ad@anJCH`;2+*(-ECS3E;j)K_?v;l$_pnvM`dcVVqih*e>d-cPhb;q*Jv_<0R0A6t1O(i=FdOMltkOz( zr;TtTy5ejAqI~8rRqN!%l}Hugfv1JFVyS)l>M;Rs-mfK8*7WL8hY$63lY%lQ&=2=H zC3GTgXBiNcrT_vG+%$l$rhBYMOxfM0`K?c*|D{FPTIlX_Q(HKh#b1KOZ*4Koy~L82 zuKJwJLy!2_6-OVlTcsk-aJ$3^K}tPCeIR5DNl4H8pmj---8jmnx`O{ng_q2B6Ymx1 z?q7ETD7ghGgiK!PS}{J-Cormf#{@IQR&3YP)wqcz&8hmtpgS}wDnSqAEWUSDfvy0q zOtPPR8;aUsT8b{1*?oj4;Of*sE^Uo1rukJgCbwq=hqSIgk-t5R&W7EX$KBMc3rnYy zT7P^g_4*y783#q22OB+7Gj!t+G{=<}>3VYPPRdoe#=KMUtSfp(SW_4)5OSy6k7zDT zwV{e<+F-lr%1(_lxkSS{@_pF)$&W`X-gCoh28>V5Fklf=@|KEo;xc!RQR>ugR9&%V z-$rdWxZ|nB7S~s9&1XYk?irZ)YLIh;Og*5nH&l-hoN7rJ7tj;|4?t_;zgE{ z&e|<5?*^yl+0BA*r>g9Evw5A{###;$wXOVWgy`b-Kvm_ zztA7W%g=FUj5owX@|Ep%8C*bf$3p8dhA+vX%3fPy`B*UwkfW)zcwutQ6Rq)Y&F2Hf zvuC(z!}GDvpal=wXli&u)aXPQ`U%lkPD95^Yu&z%zCU98`TQp(?ZNOh$KT7E9 zHwjruz6@EPx;CpWQ`K4XoxL?cp3MJ6!U3 zDf%Oh4-e%$O$(8xheJovZg1(ww(@%Enn6r(enW}iLXY*)xq|kkC9`*` kpityA5Uu|5|H(l`3tq@-9?Ip~0|94YW^8R#eZwu`KQ;oiga7~l delta 2459 zcmV;M31s%76{QuB&40s5L_t(|ob8=`OdIDN$G^vmXI_?qrICbrokbKz7J{}!q+_9( zGnF#308Sdw27(gQu>egpr7KG{G^K1JQkJqxOInh#twp?Ki`wy~l18D8$yjMq(Mr%% zv{8^3NCGS~!7leW^huK_J*YLWlUFM{1JfyRRU zK_3Etd9f|z)_=F$`i!qD;li>8*0gB!NLQt02;&MQoX6Lo(rE==*H}JB!MM@!!9+9lv_@D*Afb1rrQ&4?Ijz|MX=5 zz#Av4v8Vi)Is%FZV$;z|VZ5N&hKt?NIPh9CTILtg**1cffgzXW z`+G{zGH?NAvkiZ0I)g3CsPA0({PVNyZ67FrUW8`s(P_4^!{P+_vYei2- zonv9U35K}`0LwMIs`7m4d+f&e2fUf2ov^KsA0O)KRL05AQI@?BsyierhE~`GkwE|7$5HyuT9xXtu zzR&9b9+LNh8VmNbqpP__YPDLiwB%S_Uw=z3N?sVoh1a)W=Yc^0p1q@RTnBj5=X*JP zq4TxBt2sy57P0yP4?&S|FUP&`0SL9-xz_W&6SLWdtgMZ|KzMG4xa;%1Fz12?I3xO6 zaD;SlkMphq2({sbeFfC&nJi2*`; z=nxA00}Imnp*;5vh2Hi$hAE6wvX&oZLZ{P7%B)hUARp8M08F`RN%>VO6#yXC{>+r5 zzE-gTYf@F1nUo&?XVLsPUIfNbKH*n7_os>Rb_;ZJ;mzt#MAyJKt3QDu>Y6Z3 zTL0Il-Ui%iv_JSmjWhCig~%4bEz5`R#{fX8<~iKy`kUwt@J2;bwxk+(u4^^$*S8S~ z`X_4l+D#CLd*K5Jtp$X-^8ivOe#QCbVIBGDx+*cK24 za5XR#bUGa>nzB98jnfk_PEWWL2Ef%;d7h)|M_RwWwp8e?1dC}wkH^!M+;9CFjNfR( z)R zqBHy(q#oyhCvtLsku-XZ?^l1JR;$%MbiVMl0ToTz=oWblu4u}}t+Rl&@1KYS{ln$k zaJu!1pbD<{u!27Ej;h-}6JMd~+^ zYBXPgA6Ui$MM8o{`g2D09OMQ2?@~8&m%ukhHSy$xm+&n zaA(_yFz#Fsyr%OwN&Um++rU7E7#N{YrXWQbk7Q*Ml9fqNC{tX90KA?rObdDsQ(RtN zjaY}YLnL&P{v}52UqZwNb{{aA8TlEd@jS!LObUGLe^W0nL07&X< z6&nz>lmdk^MUuXLa>nIusB`|l4(>lPib@-}1lEe4^T$!NuO3z=NyxtxHN&-lnu8^{ zWHe*lUXAFXJGq-TVr1mHsG-3ykD7yyo(XCFBUNf#=qG1Tw(Gm1hweDf`@!})w0B&_ z%;W-|-L(}nx6R!2ZL_f4kt#I+`wJSRABd3FC;C8!z9B;v`b?NG)BwUz0|-M6APhBt zFw_9TPy+}P@XtCPb$s9Wd^pe+ll%lGf2=p-k}T&$MHk$UJw*K9cq4_d8IWW-$BK{7 z2TM)h2%7;?zLv6nJutZ zfN?Av352Z$NR7`AH&WyCBZaVqr%R3T569OnoRJ#i&wm?-bXdxYe?Ne<0rX}Zk_8kN Z=Km2~r^JC)xv>BM002ovPDHLkV1k)y)rbH9