cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Add new Wallets! station trait (#6704)

Browse Source 
* Add new Wallets! station trait

* Update wallets.dm

Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-07-05 00:59:42 +02:00
committed by GitHub
parent 4eb10be816
commit fb5576ee8f
5 changed files with 171 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/lootdrop.dm
+102
View File
@@ -743,3 +743,105 @@
/obj/item/phone = 5,
/obj/item/flashlight/lamp/bananalamp = 3
)
/obj/effect/spawner/lootdrop/wallet_loot
lootcount = 1
loot = list(
list(
// Same weights as contraband loot cigarettes (with no packs)
/obj/item/clothing/mask/cigarette/space_cigarette = 4,
/obj/item/clothing/mask/cigarette/robust = 2,
/obj/item/clothing/mask/cigarette/carp = 3,
/obj/item/clothing/mask/cigarette/uplift = 2,
/obj/item/clothing/mask/cigarette/dromedary = 3,
/obj/item/clothing/mask/cigarette/robustgold = 1,
/obj/item/clothing/mask/cigarette/rollie/cannabis = 4,
) = 1,
list(
/obj/item/flashlight/pen = 90,
/obj/item/flashlight/pen/paramedic = 10,
) = 1,
list( // The same seeds in the Supply "Seeds Crate"
/obj/item/seeds/chili = 1,
/obj/item/seeds/cotton = 1,
/obj/item/seeds/berry = 1,
/obj/item/seeds/corn = 1,
/obj/item/seeds/eggplant = 1,
/obj/item/seeds/tomato = 1,
/obj/item/seeds/soya = 1,
/obj/item/seeds/wheat = 1,
/obj/item/seeds/wheat/rice = 1,
/obj/item/seeds/carrot = 1,
/obj/item/seeds/sunflower = 1,
/obj/item/seeds/rose = 1,
/obj/item/seeds/chanter = 1,
/obj/item/seeds/potato = 1,
/obj/item/seeds/sugarcane = 1,
) = 1,
list(
/obj/item/stack/medical/suture = 1,
/obj/item/stack/medical/mesh = 1,
/obj/item/stack/medical/gauze = 1,
) = 1,
list(
/obj/item/toy/crayon/red = 1,
/obj/item/toy/crayon/orange = 1,
/obj/item/toy/crayon/yellow = 1,
/obj/item/toy/crayon/green = 1,
/obj/item/toy/crayon/blue = 1,
/obj/item/toy/crayon/purple = 1,
/obj/item/toy/crayon/black = 1,
/obj/item/toy/crayon/rainbow = 1,
) = 1,
list(
/obj/item/coin/iron = 1,
/obj/item/coin/silver = 1,
/obj/item/coin/diamond = 1,
/obj/item/coin/plasma = 1,
/obj/item/coin/uranium = 1,
/obj/item/coin/titanium = 1,
/obj/item/coin/bananium = 1,
/obj/item/coin/adamantine = 1,
/obj/item/coin/mythril = 1,
/obj/item/coin/plastic = 1,
/obj/item/coin/runite = 1,
/obj/item/coin/twoheaded = 1,
/obj/item/coin/antagtoken = 1,
) = 1,
list(
/obj/item/dice/d4 = 1,
/obj/item/dice/d6 = 1,
/obj/item/dice/d8 = 1,
/obj/item/dice/d10 = 1,
/obj/item/dice/d12 = 1,
/obj/item/dice/d20 = 1,
) = 1,
list(
/obj/item/disk/data = 99,
/obj/item/disk/nuclear/fake/obvious = 1,
) = 1,
/obj/item/implanter = 1,
list(
/obj/item/lighter = 25,
/obj/item/lighter/greyscale = 75,
) = 1,
/obj/item/lipstick/random = 1,
/obj/item/match = 1,
/obj/item/paper/pamphlet/gateway = 1,
list(
/obj/item/pen = 1,
/obj/item/pen/blue = 1,
/obj/item/pen/red = 1,
/obj/item/pen/fourcolor = 1,
/obj/item/pen/fountain = 1,
) = 1,
// random photos would go here. IF I HAD ONE. :'(
/obj/item/reagent_containers/dropper = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/item/reagent_containers/pill/maintenance = 1,
/obj/item/screwdriver = 1,
list(
/obj/item/stamp = 50,
/obj/item/stamp/denied = 50,
) = 1,
)
code/game/objects/items/storage/wallets.dm
+8 -3
View File
@@ -37,6 +37,7 @@
/obj/item/photo,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/pill,
/obj/item/screwdriver,
/obj/item/stamp),
list(/obj/item/screwdriver/power))
@@ -101,6 +102,7 @@
cached_flat_icon = null
if(!front_id)
return
COMPILE_OVERLAYS(front_id)
. += mutable_appearance(front_id.icon, front_id.icon_state)
. += front_id.overlays
. += mutable_appearance(icon, "wallet_overlay")
@@ -156,9 +158,12 @@
return ..()
/obj/item/storage/wallet/random
icon_state = "random_wallet"
icon_state = "random_wallet" // for mapping purposes
/obj/item/storage/wallet/random/PopulateContents()
new /obj/item/holochip(src, rand(5,30))
/obj/item/storage/wallet/random/Initialize()
. = ..()
icon_state = "wallet"
/obj/item/storage/wallet/random/PopulateContents()
new /obj/item/holochip(src, rand(5, 30))
new /obj/effect/spawner/lootdrop/wallet_loot(src)