diff --git a/code/datums/elements/lootable/trash.dm b/code/datums/elements/lootable/trash.dm index abbea39621f..9393807ce15 100644 --- a/code/datums/elements/lootable/trash.dm +++ b/code/datums/elements/lootable/trash.dm @@ -61,6 +61,7 @@ /obj/item/clothing/suit/caution, /obj/item/cell, /obj/item/cell/device, + /obj/item/flashlight/flare, /obj/item/reagent_containers/food/snacks/liquidfood, /obj/item/spacecash/c1, /obj/item/storage/backpack/satchel, @@ -83,42 +84,33 @@ /obj/item/camera_assembly, /obj/item/clothing/head/cone, /obj/item/cell/high, - /obj/item/spacecash/c10, - /obj/item/spacecash/c20, + /obj/item/poster, + /obj/item/clothing/shoes/galoshes, + /obj/item/spacecash/random_value/low, /obj/item/storage/backpack/dufflebag, /obj/item/storage/box/donkpockets, /obj/item/storage/box/mousetraps, + /obj/item/toy/baseball, + /obj/item/storage/box/cups, /obj/item/storage/wallet) uncommon_loot = list( + /obj/item/pen/chameleon, /obj/item/clothing/glasses/meson/prescription, /obj/item/clothing/gloves/fyellow, - /obj/item/clothing/gloves/sterile/latex, + /obj/item/clothing/gloves/sterile/thieves, /obj/item/clothing/head/welding, /obj/item/clothing/mask/gas/half, - /obj/item/clothing/shoes/galoshes, /obj/item/clothing/under/pants/camo, /obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/hyperfiber, /obj/item/camera, - /obj/item/flashlight/flare, - /obj/item/flashlight/glowstick, - /obj/item/flashlight/glowstick/blue, - /obj/item/card/emag_broken, /obj/item/cell/super, - /obj/item/poster, /obj/item/reagent_containers/glass/rag, /obj/item/storage/box/sinpockets, /obj/item/storage/secure/briefcase, /obj/item/clothing/under/fluff/latexmaid, - /obj/item/toy/tennis, - /obj/item/toy/tennis/red, - /obj/item/toy/tennis/yellow, - /obj/item/toy/tennis/green, - /obj/item/toy/tennis/cyan, - /obj/item/toy/tennis/blue, - /obj/item/toy/tennis/purple, - /obj/item/toy/baseball, + /obj/item/toy/tennis/random, /obj/item/storage/box/brainzsnax, /obj/item/storage/box/brainzsnax/red, /obj/item/clothing/glasses/sunglasses, @@ -132,18 +124,15 @@ /obj/item/clothing/suit/space/emergency, /obj/item/clothing/under/harness, /obj/item/clothing/under/tactical, - /obj/item/clothing/suit/armor/material/makeshift, - /obj/item/flashlight/glowstick/orange, - /obj/item/flashlight/glowstick/red, - /obj/item/flashlight/glowstick/yellow, + /obj/item/clothing/suit/armor/material/makeshift/random, + /obj/item/flashlight/glowstick/random, /obj/item/flashlight/pen, /obj/item/paicard, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/mask/gas/voice, - /obj/item/spacecash/c100, - /obj/item/spacecash/c50, - /obj/item/storage/backpack/dufflebag/syndie, - /obj/item/storage/box/cups) + /obj/item/spacecash/random_value, + /obj/item/clothing/gloves/bluespace/deluxe, + /obj/item/storage/backpack/dufflebag/syndie) rare_loot = list( /obj/item/pizzavoucher, @@ -187,7 +176,6 @@ /obj/item/reagent_containers/syringe/steroid, /obj/item/capture_crystal, /obj/item/perfect_tele/one_beacon, - /obj/item/clothing/gloves/bluespace, /obj/item/gun/energy/mouseray, /obj/item/clothing/accessory/collar/shock/bluespace/modified, /obj/item/gun/energy/sizegun/backfire, diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 29cb86a7423..02cd3b711c9 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -512,6 +512,14 @@ user.visible_message(span_notice("[user] cracks and shakes \the [name]."), span_notice("You crack and shake \the [src], turning it on!")) START_PROCESSING(SSobj, src) +/obj/item/flashlight/glowstick/random + +/obj/item/flashlight/glowstick/random/Initialize(mapload) + . = ..() + var/stick_to_pick = pick(typesof(/obj/item/flashlight/glowstick) - /obj/item/flashlight/glowstick/random) + new stick_to_pick(loc) + return INITIALIZE_HINT_QDEL + /obj/item/flashlight/glowstick/red name = "red glowstick" desc = "A red military-grade chemical light." diff --git a/code/game/objects/items/toys/balls_vr.dm b/code/game/objects/items/toys/balls_vr.dm index a8d56bfe2ef..28c88459fa1 100644 --- a/code/game/objects/items/toys/balls_vr.dm +++ b/code/game/objects/items/toys/balls_vr.dm @@ -13,6 +13,14 @@ throw_range = 14 w_class = ITEMSIZE_SMALL +/obj/item/toy/tennis/random + +/obj/item/toy/tennis/random/Initialize(mapload) + . = ..() + var/ball_to_pick = pick(subtypesof(/obj/item/toy/tennis) - /obj/item/toy/tennis/random) + new ball_to_pick(loc) + return INITIALIZE_HINT_QDEL + /obj/item/toy/tennis/red name = "red tennis ball" desc = "A red tennis ball. It goes twice as fast!" diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index 712e5c58e2f..293fc54e97b 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -205,6 +205,15 @@ Protectiveness | Armor % desc = "This appears to be two 'sheets' of a material held together by cable. If the sheets are strong, this could be rather protective." icon_state = "material_armor_makeshift" +/obj/item/clothing/suit/armor/material/makeshift/random + +/obj/item/clothing/suit/armor/material/makeshift/random/Initialize(mapload) + . = ..() + var/armor_to_pick = pick(subtypesof(/obj/item/clothing/suit/armor/material/makeshift) - /obj/item/clothing/suit/armor/material/makeshift/random) + new armor_to_pick(loc) + return INITIALIZE_HINT_QDEL + + /obj/item/clothing/accessory/material/makeshift/light //Craftable with 4 material sheets, less slowdown, less armour name = "light armor plate" desc = "A thin plate of padded material, designed to fit into a plate carrier. Attaches to a plate carrier." diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 5a2457c9892..57bbbb9851f 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -156,6 +156,22 @@ desc = "It's worth 1000 Thalers." worth = 1000 +/obj/item/spacecash/random_value + name = "random Thaler" + icon_state = "spacecash1" + desc = "It's worth a random amount of Thalers." + worth = 0 + var/low_value = 1 + var/high_value = 1000 + +/obj/item/spacecash/random_value/Initialize(mapload) + . = ..() + set_worth(rand(low_value, high_value)) + +/obj/item/spacecash/random_value/low + low_value = 1 + high_value = 100 + /proc/spawn_money(sum, spawnloc, mob/living/carbon/human/human_user as mob) var/obj/item/spacecash/SC = new (spawnloc)