Skip to content

Commit

Permalink
Randoms Part 1 and also Corn - Random object sprites and corn tank ch…
Browse files Browse the repository at this point in the history
…anges. (Aurorastation#19975)

Added new sprites for random objects for everything in random/clothing,
/food, /loot, /medical, and /misc.
Also got distracted and changed how the corn oil/cooking oil tank looks
and how much reagent it holds. Now looks like the rest of the reagent
tanks and holds the same amount of liquid, 1000u.
  • Loading branch information
courierbravo authored Oct 5, 2024
1 parent a4b0d01 commit ea56fbf
Show file tree
Hide file tree
Showing 11 changed files with 122 additions and 86 deletions.
27 changes: 9 additions & 18 deletions code/game/objects/random/clothing.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/obj/random/belt
name = "random belt"
icon_state = "toolbelt"
problist = list(
/obj/item/storage/belt/utility = 1,
/obj/item/storage/belt/medical = 0.4,
Expand All @@ -14,6 +15,7 @@
// Novelty and rare backpacks have lower weights.
/obj/random/backpack
name = "random backpack"
icon_state = "backpack"
problist = list(
/obj/item/storage/backpack = 3,
/obj/item/storage/backpack/cultpack = 2,
Expand Down Expand Up @@ -63,8 +65,7 @@
/obj/random/colored_jumpsuit
name = "random colored jumpsuit"
desc = "This is a random colored jumpsuit."
icon = 'icons/obj/clothing/uniforms.dmi'
icon_state = "black"
icon_state = "uniform"
spawnlist = list(
/obj/item/clothing/under/color/black,
/obj/item/clothing/under/color/blue,
Expand All @@ -91,8 +92,7 @@
/obj/random/suit
name = "random suit"
desc = "This is a random suit."
icon = 'icons/obj/clothing/uniforms.dmi'
icon_state = "checkered_suit"
icon_state = "uniform"
spawnlist = list(
/obj/item/clothing/under/suit_jacket/charcoal,
/obj/item/clothing/under/suit_jacket/navy,
Expand All @@ -109,8 +109,7 @@
/obj/random/chameleon
name = "random possible chameleon item"
desc = "A random possible chameleon item. What could possibly go wrong?"
icon = 'icons/obj/clothing/gloves.dmi'
icon_state = "yellow"
icon_state = "uniform"
problist = list(

/obj/item/clothing/gloves/chameleon = 1,
Expand Down Expand Up @@ -143,8 +142,7 @@
/obj/random/gloves
name = "random gloves"
desc = "Random gloves, assorted usefulness."
icon = 'icons/obj/clothing/gloves.dmi'
icon_state = "yellow"
icon_state = "gloves"
problist = list(
/obj/item/clothing/gloves/black = 1,
/obj/item/clothing/gloves/black_leather = 0.5,
Expand All @@ -162,7 +160,6 @@
/obj/random/watches
name = "random watches"
desc = "Random watches, probably able to tell the time."
icon = 'icons/obj/clothing/gloves.dmi'
icon_state = "watch"
problist = list(
/obj/item/clothing/wrists/watch = 1,
Expand All @@ -174,8 +171,7 @@
/obj/random/hoodie
name = "random winter coat"
desc = "This is a random winter coat."
icon = 'icons/obj/clothing/hoodies.dmi'
icon_state = "coatwinter"
icon_state = "wintercoat"
problist = list(
/obj/item/clothing/suit/storage/hooded/wintercoat = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 3,
Expand All @@ -192,7 +188,6 @@
/obj/random/bandana
name = "random bandana"
desc = "This is a random bandana."
icon = 'icons/obj/clothing/hats/bandanas.dmi'
icon_state = "bandana"
problist = list(
/obj/item/clothing/head/bandana/colorable/random = 5,
Expand All @@ -210,7 +205,6 @@
/obj/random/softcap
name = "random softcap"
desc = "This is a random softcap."
icon = 'icons/obj/clothing/hats/soft_caps.dmi'
icon_state = "softcap"
problist = list(
/obj/item/clothing/head/softcap/colorable/random = 5,
Expand All @@ -228,7 +222,6 @@
/obj/random/beret
name = "random beret"
desc = "This is a random beret."
icon = 'icons/obj/clothing/hats/berets.dmi'
icon_state = "beret"
problist = list(
/obj/item/clothing/head/beret/colorable/random = 5,
Expand All @@ -247,8 +240,7 @@
/obj/random/hardhat
name = "random hardhat"
desc = "This is a random hardhat."
icon = 'icons/obj/clothing/hats/hardhats.dmi'
icon_state = "hardhat_yellow"
icon_state = "hardhat"
problist = list(
/obj/item/clothing/head/hardhat = 1,
/obj/item/clothing/head/hardhat/orange = 1,
Expand All @@ -264,8 +256,7 @@
/obj/random/wizard_dressup
name = "random wizard clothes"
desc = "This is a random piece of fake wizard clothing."
icon = 'icons/obj/wizard.dmi'
icon_state = "staff"
icon_state = "wizardstaff"
has_postspawn = TRUE

/obj/random/wizard_dressup/spawn_item()
Expand Down
18 changes: 7 additions & 11 deletions code/game/objects/random/food.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/obj/random/mre
name = "random MRE"
desc = "This is a random single MRE."
icon = 'icons/obj/storage/fancy/mre.dmi'
icon_state = "mre"
icon_state = "mre_bag"
spawnlist = list(
/obj/item/storage/box/fancy/mre,
/obj/item/storage/box/fancy/mre/menu2,
Expand All @@ -19,7 +18,7 @@
/obj/random/mre/main
name = "random MRE main course"
desc = "This is a random main course for MREs."
icon_state = "pouch_medium"
icon_state = "mre_meal"
spawnlist = list(
/obj/item/storage/box/fancy/mrebag,
/obj/item/storage/box/fancy/mrebag/menu2,
Expand All @@ -34,7 +33,7 @@
/obj/random/mre/dessert
name = "random MRE dessert"
desc = "This is a random dessert for MREs."
icon_state = "pouch_medium"
icon_state = "mre_desert"
spawnlist = list(
/obj/item/reagent_containers/food/snacks/candy,
/obj/item/reagent_containers/food/snacks/cb01,
Expand Down Expand Up @@ -93,7 +92,7 @@
/obj/random/mre/spread
name = "random MRE spread"
desc = "This is a random spread packet for MREs."
icon_state = "packet_small"
icon_state = "packet_medium"
spawnlist = list(
/obj/item/reagent_containers/food/condiment/small/packet/jelly,
/obj/item/reagent_containers/food/condiment/small/packet/honey
Expand All @@ -107,7 +106,7 @@
/obj/random/mre/sauce
name = "random MRE sauce"
desc = "This is a random sauce packet for MREs."
icon_state = "packet_small"
icon_state = "packet_medium"
spawnlist = list(
/obj/item/reagent_containers/food/condiment/small/packet/salt,
/obj/item/reagent_containers/food/condiment/small/packet/pepper,
Expand Down Expand Up @@ -152,7 +151,6 @@
/obj/random/booze
name = "random alcohol bottle"
desc = "This is a random alcohol bottle."
icon = 'icons/obj/drinks.dmi'
icon_state = "broken_bottle"
spawnlist = list(
/obj/item/reagent_containers/food/drinks/bottle/gin,
Expand Down Expand Up @@ -190,8 +188,7 @@
/obj/random/keg
name = "random alcohol keg"
desc = "Contains a random alcohol keg."
icon = 'icons/obj/reagent_dispensers.dmi'
icon_state = "beertankTEMP"
icon_state = "keg"
spawnlist = list(
/obj/structure/reagent_dispensers/keg/beerkeg = 2,
/obj/structure/reagent_dispensers/keg/beerkeg/rice = 0.5,
Expand All @@ -203,8 +200,7 @@
/obj/random/pizzabox
name = "random pizzabox"
desc = "Contains a random pizzabox."
icon = 'icons/obj/storage/fancy/pizzabox.dmi'
icon_state = "pizzabox1"
icon_state = "pizzabox"
spawnlist = list(
/obj/item/pizzabox/margherita,
/obj/item/pizzabox/vegetable,
Expand Down
40 changes: 22 additions & 18 deletions code/game/objects/random/loot.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/obj/random/loot
name = "random maintenance loot"
desc = "Stuff for the maint-dwellers."
icon = 'icons/holidays/christmas/presents.dmi'
icon_state = "gift1"
icon_state = "gasmask"
problist = list(
/obj/item/bluespace_crystal/artificial = 0.1,
/obj/item/bodybag = 0.7,
Expand Down Expand Up @@ -169,8 +168,7 @@
/obj/random/highvalue
name = "random high value item"
desc = "This is a random high value item."
icon = 'icons/obj/coins.dmi'
icon_state = "coin_diamond_heads"
icon_state = "coin"
problist = list(
/obj/random/telecrystals = 0.1,
/obj/item/gun/projectile/automatic/rifle/shotgun = 0.1,
Expand Down Expand Up @@ -229,8 +227,7 @@
/obj/random/highvalue/safe
name = "random corporate safe high value item"
desc = "This is a random corporate safe high value item."
icon = 'icons/obj/coins.dmi'
icon_state = "coin_diamond_heads"
icon_state = "coin"
problist = list(
/obj/item/device/personal_shield = 0.4,
/obj/random/safe_rig = 0.4,
Expand All @@ -247,8 +244,7 @@
/obj/random/custom_ka
name = "random custom kinetic accelerator"
desc = "Contains random assemblies. The parts may not always be compatible with eachother."
icon = 'icons/obj/kinetic_accelerators.dmi'
icon_state = "frame01"
icon_state = "kinetic"
spawnlist = list(
/obj/item/toy/mech/honk
)
Expand Down Expand Up @@ -298,8 +294,7 @@
/obj/random/prebuilt_ka
name = "random prebuilt kinetic accelerator"
desc = "Contains working kinetic accelerators that were prebuilt in code."
icon = 'icons/obj/kinetic_accelerators.dmi'
icon_state = "frameA"
icon_state = "kinetic"
spawnlist = list(
/obj/item/gun/custom_ka/frame01/prebuilt = 2.5,
/obj/item/gun/custom_ka/frame02/prebuilt = 5,
Expand All @@ -317,8 +312,7 @@
/obj/random/telecrystals
name = "random telecrystals"
desc = "Contains a random amount of telecrystals."
icon = 'icons/obj/telescience.dmi'
icon_state = "telecrystal"
icon_state = "crystal"
spawnlist = list(
/obj/item/stack/telecrystal{amount = 10} = 0.5,
/obj/item/stack/telecrystal{amount = 15} = 0.4,
Expand All @@ -329,8 +323,7 @@
/obj/random/contraband
name = "random contraband"
desc = "This is some random contraband."
icon = 'icons/obj/cosmetics.dmi'
icon_state = "purplecomb"
icon_state = "knife"
problist = list(
/obj/item/storage/pill_bottle/mortaphenyl = 3,
/obj/item/storage/pill_bottle/happy = 2,
Expand Down Expand Up @@ -369,8 +362,7 @@
/obj/random/coin
name = "random coin"
desc = "This is a random coin."
icon = 'icons/obj/coins.dmi'
icon_state = "coin__heads"
icon_state = "coin"
problist = list(
/obj/item/coin/iron = 5,
/obj/item/coin/silver = 3,
Expand All @@ -384,8 +376,7 @@
/obj/random/spacecash
name = "random credit chips"
desc = "This is a random credit chip."
icon = 'icons/obj/cash.dmi'
icon_state = "spacecash1"
icon_state = "cash"
problist = list(
/obj/item/spacecash/c1 = 6,
/obj/item/spacecash/c10 = 3,
Expand All @@ -399,6 +390,7 @@
/obj/random/finances
name = "random valued item"
desc = "Contains raw valued items like phoron, gold, and money."
icon_state = "valuable"
spawnlist = list(
/obj/item/spacecash/bundle{worth = 5000} = 0.25,
/obj/item/spacecash/bundle{worth = 10000} = 0.5,
Expand All @@ -414,6 +406,7 @@

/obj/random/barricade_materials
name = "random barricade materials"
icon_state = "barricade"
spawnlist = list(
/obj/item/stack/material/steel = 0.75,
/obj/item/stack/material/plasteel = 0.25,
Expand All @@ -428,6 +421,7 @@

/obj/random/barbed_wire
name = "barbed wire"
icon_state = "barbed_wire"
spawnlist = list(
/obj/item/stack/barbed_wire = 1
)
Expand All @@ -440,6 +434,7 @@

/obj/random/tool_konyang
name = "tool"
icon_state = "tool"
spawnlist = list(
/obj/item/screwdriver = 1,
/obj/item/crowbar = 1,
Expand All @@ -451,6 +446,7 @@

/obj/random/survival_weapon
name = "survival weapon"
icon_state = "melee"
problist = list(
/obj/item/crowbar = 1,
/obj/item/shovel = 1,
Expand All @@ -472,6 +468,7 @@

/obj/random/high_grade_weapon
name = "high grade weapon"
icon_state = "melee"
problist = list(
/obj/item/material/sword/axe = 0.5,
/obj/item/material/sword/longsword = 0.25,
Expand All @@ -484,6 +481,7 @@

/obj/random/light
name = "random light"
icon_state = "flashlight"
problist = list(
/obj/item/device/flashlight = 1,
/obj/item/device/flashlight/flare = 2,
Expand All @@ -497,6 +495,7 @@

/obj/random/med_stack
name = "medical supplies"
icon_state = "med"
problist = list(
/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
Expand All @@ -512,6 +511,7 @@

/obj/random/splints
name = "splints"
icon_state = "med"
problist = list(
/obj/item/stack/medical/splint = 1
)
Expand All @@ -523,6 +523,7 @@
M.update_icon()

/obj/random/gun_with_ammo
icon_state = "blast_carbine"
has_postspawn = TRUE

/obj/random/gun_with_ammo/post_spawn(obj/thing)
Expand Down Expand Up @@ -575,6 +576,7 @@

/obj/random/shotgun
name = "shotgun"
icon_state = "shotgun"
problist = list(
/obj/item/gun/projectile/shotgun/foldable = 1,
/obj/item/gun/projectile/shotgun/doublebarrel = 1,
Expand All @@ -596,6 +598,7 @@

/obj/random/semiautos
name = "semiautos"
icon_state = "shotgun"
problist = list(
/obj/item/gun/projectile/shotgun/pump/rifle/scope = 0.05,
/obj/item/gun/projectile/shotgun/pump/rifle/obrez = 1,
Expand All @@ -612,6 +615,7 @@

/obj/random/barricade_kit
name = "barricade kits"
icon_state = "barricade"
problist = list(
/obj/item/stack/barricade/random = 1,
/obj/item/stack/barricade/wood/random = 0.5,
Expand Down
Loading

0 comments on commit ea56fbf

Please sign in to comment.