diff --git a/code/game/objects/random/clothing.dm b/code/game/objects/random/clothing.dm index 902879659b5..10c907f88fc 100644 --- a/code/game/objects/random/clothing.dm +++ b/code/game/objects/random/clothing.dm @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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() diff --git a/code/game/objects/random/food.dm b/code/game/objects/random/food.dm index ff9f8d247d0..3068aba02e2 100644 --- a/code/game/objects/random/food.dm +++ b/code/game/objects/random/food.dm @@ -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, @@ -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, @@ -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, @@ -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 @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm index cc90c748a40..296d07478a7 100644 --- a/code/game/objects/random/loot.dm +++ b/code/game/objects/random/loot.dm @@ -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, @@ -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, @@ -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, @@ -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 ) @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -428,6 +421,7 @@ /obj/random/barbed_wire name = "barbed wire" + icon_state = "barbed_wire" spawnlist = list( /obj/item/stack/barbed_wire = 1 ) @@ -440,6 +434,7 @@ /obj/random/tool_konyang name = "tool" + icon_state = "tool" spawnlist = list( /obj/item/screwdriver = 1, /obj/item/crowbar = 1, @@ -451,6 +446,7 @@ /obj/random/survival_weapon name = "survival weapon" + icon_state = "melee" problist = list( /obj/item/crowbar = 1, /obj/item/shovel = 1, @@ -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, @@ -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, @@ -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, @@ -512,6 +511,7 @@ /obj/random/splints name = "splints" + icon_state = "med" problist = list( /obj/item/stack/medical/splint = 1 ) @@ -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) @@ -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, @@ -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, @@ -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, diff --git a/code/game/objects/random/medical.dm b/code/game/objects/random/medical.dm index 4d6c06ef506..4ea548abc5d 100644 --- a/code/game/objects/random/medical.dm +++ b/code/game/objects/random/medical.dm @@ -1,8 +1,7 @@ /obj/random/medical name = "random medical item" desc = "This is a random medical item." - icon = 'icons/obj/item/stacks/medical.dmi' - icon_state = "brutepack" + icon_state = "medpack" spawn_nothing_percentage = 25 problist = list( /obj/item/stack/medical/bruise_pack = 4, @@ -36,7 +35,6 @@ /obj/random/firstaid name = "random first aid kit" desc = "This is a random first aid kit." - icon = 'icons/obj/storage/firstaid.dmi' icon_state = "firstaid" problist = list( /obj/item/storage/firstaid/regular = 4, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 2448f5d7171..deae873ef64 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -1,8 +1,7 @@ /obj/random/smokable name = "random smokable" desc = "This is a random smoking item." - icon = 'icons/obj/cigs_lighters.dmi' - icon_state = "cigpacket" + icon_state = "cigarettes" problist = list( /obj/item/storage/box/fancy/cigarettes = 30, /obj/item/storage/box/fancy/cigarettes/blank = 5, @@ -21,8 +20,7 @@ /obj/random/action_figure name = "random action figure" desc = "This is a random action figure." - icon = 'icons/obj/toy.dmi' - icon_state = "assistant" + icon_state = "toy" spawnlist = list( /obj/item/toy/figure/cmo, /obj/item/toy/figure/assistant, @@ -67,8 +65,7 @@ /obj/random/plushie name = "random plushie" desc = "This is a random plushie." - icon = 'icons/obj/toy.dmi' - icon_state = "nymphplushie" + icon_state = "plushie" spawnlist = list( /obj/item/toy/plushie/ian, /obj/item/toy/plushie/drone, @@ -91,8 +88,7 @@ /obj/random/balloon name = "random balloon" desc = "This is a random balloon." - icon = 'icons/obj/toy.dmi' - icon_state = "balloon" + icon_state = "bloon" spawnlist = list( /obj/item/toy/balloon/color = 7, /obj/item/toy/balloon/latex = 1, @@ -112,8 +108,7 @@ /obj/random/desktoy name = "random desk toy" desc = "This is a random desk toy." - icon = 'icons/obj/toy.dmi' - icon_state = "dippybird" + icon_state = "desktoy" spawnlist = list( /obj/item/toy/desk/newtoncradle, /obj/item/toy/desk/fan, @@ -124,7 +119,6 @@ /obj/random/lavalamp name = "random lava lamp" desc = "This is a random lava lamp." - icon = 'icons/obj/lighting.dmi' icon_state = "lavalamp" spawnlist = list( /obj/item/device/flashlight/lamp/lava, @@ -141,7 +135,6 @@ /obj/random/glowstick name = "random glowstick" desc = "This is a random glowstick." - icon = 'icons/obj/lighting.dmi' icon_state = "glowstick" spawnlist = list( /obj/item/device/flashlight/flare/glowstick, @@ -154,8 +147,7 @@ /obj/random/arcade name = "random arcade loot" desc = "Arcade loot!" - icon = 'icons/obj/items.dmi' - icon_state = "gift3" + icon_state = "toy" spawnlist = list( /obj/item/storage/box/snappops = 11, /obj/item/clothing/under/syndicate/tacticool = 5, @@ -204,8 +196,7 @@ /obj/random/arcade/orion name = "random arcade loot for orion trails" desc = "Arcade loot for orion trails aracde machine!" - icon = 'icons/obj/items.dmi' - icon_state = "gift3" + icon_state = "toy" spawnlist = list( /obj/item/clothing/under/syndicate/tacticool = 7, /obj/item/toy/sword = 22, @@ -232,8 +223,7 @@ /obj/random/animal_crate name = "random animal" desc = "Contains a random crate with an animal." - icon = 'icons/obj/structures.dmi' - icon_state = "densecrate" + icon_state = "woodcrate" spawnlist = list( /obj/structure/largecrate/animal/corgi = 3, /obj/structure/largecrate/animal/cow = 4, @@ -254,8 +244,7 @@ /obj/random/random_flag name = "random flag" desc = "Contains a random boxed flag or banner." - icon = 'icons/obj/decals.dmi' - icon_state = "flag_boxed" + icon_state = "flagbox" spawnlist = list( /obj/item/flag/biesel, /obj/item/flag/biesel/l, @@ -292,8 +281,7 @@ /obj/random/gift name = "random gift" desc = "Contains a randomly sized gift." - icon = 'icons/holidays/christmas/presents.dmi' - icon_state = "gift1" + icon_state = "present" spawnlist = list( /obj/item/xmasgift = 0.5, /obj/item/xmasgift/medium = 0.3, @@ -303,7 +291,6 @@ /obj/random/junk name = "random trash" desc = "This is toss." - icon = 'icons/obj/random.dmi' icon_state = "junk" spawn_nothing_percentage = 5 problist = list( @@ -375,6 +362,7 @@ /obj/random/vendor name = "random vendor" + icon_state = "vendor" var/depleted = FALSE var/scan_id = TRUE // Should the spawned vendor check IDs problist = list( @@ -427,6 +415,7 @@ /obj/random/smalltank name = "random small tank" + icon_state = "airtank" /obj/random/smalltank/item_to_spawn() if (prob(40)) @@ -439,8 +428,7 @@ /obj/random/pottedplant name = "random potted plant, big" desc = "Spawns a random potted plant." - icon = 'icons/obj/pottedplants_big.dmi' - icon_state = "plant-26" + icon_state = "potted_plant_big" spawn_nothing_percentage = 1 /obj/random/pottedplant/spawn_item() @@ -463,8 +451,7 @@ /obj/random/pottedplant_small name = "random potted plant, small" desc = "Spawns a random potted plant." - icon = 'icons/obj/pottedplants_small.dmi' - icon_state = "plant-01" + icon_state = "potted_plant_small" spawn_nothing_percentage = 1 /obj/random/pottedplant_small/spawn_item() @@ -485,6 +472,7 @@ /obj/random/syrup name = "random syrup" desc = "Contains random bottles of flavored syrup." + icon_state = "syrup" problist = list( /obj/item/reagent_containers/food/condiment/syrup_chocolate = 2, /obj/item/reagent_containers/food/condiment/syrup_strawberry = 1, @@ -502,6 +490,7 @@ /obj/random/condiment name = "random condiments and sauces" desc = "Contains random condiments for use in the kitchen." + icon_state = "condiment" spawn_nothing_percentage = 10 problist = list( /obj/item/reagent_containers/food/condiment/ketchup = 2, @@ -521,6 +510,7 @@ /obj/random/kitchen_staples name = "random kitchen staples" desc = "Contains random ingredients that are handy in the kitchen" + icon_state = "ingredient_bag" spawn_nothing_percentage = 20 problist = list( /obj/item/reagent_containers/food/condiment/gelatin = 1, diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 2216b37f3f0..a7bfb72ff94 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1,8 +1,8 @@ /obj/random name = "random object" desc = "This item type is used to spawn random objects at round-start" - icon = 'icons/misc/mark.dmi' - icon_state = "rup" + icon = 'icons/obj/random.dmi' + icon_state = "need-sprite" var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything var/list/spawnlist var/list/problist diff --git a/code/game/objects/random/tech.dm b/code/game/objects/random/tech.dm index 6db7875c047..236102d06d6 100644 --- a/code/game/objects/random/tech.dm +++ b/code/game/objects/random/tech.dm @@ -1,7 +1,6 @@ /obj/random/tool name = "random tool" desc = "This is a random tool" - icon = 'icons/obj/random.dmi' icon_state = "tool" spawnlist = list( /obj/item/screwdriver, @@ -27,7 +26,6 @@ /obj/random/powercell name = "random powercell" desc = "This is a random powercell." - icon = 'icons/obj/random.dmi' icon_state = "cell" problist = list( /obj/item/cell = 40, @@ -55,7 +53,6 @@ /obj/random/toolbox name = "random toolbox" desc = "This is a random toolbox." - icon = 'icons/obj/random.dmi' icon_state = "toolbox" spawnlist = list( /obj/item/storage/toolbox/mechanical = 3, @@ -66,7 +63,6 @@ /obj/random/tech_supply name = "random tech supply" desc = "This is a random piece of technology supplies." - icon = 'icons/obj/random.dmi' icon_state = "tech_supply" problist = list( /obj/random/powercell = 3, diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 81d64d4137d..88d46f396de 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -394,11 +394,11 @@ //Cooking oil tank /obj/structure/reagent_dispensers/cookingoil name = "cooking oil tank" - desc = "A fifty-litre tank of commercial-grade corn oil, intended for use in large scale deep fryers. Store in a cool, dark place" + desc = "A tank of commercial-grade corn oil, intended for use in large scale deep fryers. Store in a cool, dark place" icon_state = "oiltank" amount_per_transfer_from_this = 120 - capacity = 5000 - reagents_to_add = list(/singleton/reagent/nutriment/triglyceride/oil/corn = 5000) + capacity = 1000 + reagents_to_add = list(/singleton/reagent/nutriment/triglyceride/oil/corn = 1000) /obj/structure/reagent_dispensers/cookingoil/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) . = ..() diff --git a/html/changelogs/courierbravo-randoms_and_corn.yml b/html/changelogs/courierbravo-randoms_and_corn.yml new file mode 100644 index 00000000000..962b1a1cd59 --- /dev/null +++ b/html/changelogs/courierbravo-randoms_and_corn.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CourierBravo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Redid random object sprites, assigning unique sprites to each random object. With the expectation that in the future, random objects have unique icons. You'll only ever see this when you do map making stuff." + - rscadd: "Created a new sprite for the cooking oil tank, a modified reagent tank sprite." + - imageadd: "Added rainbow sprites for random objects, and replaced the oil tank sprite." + - balance: "Reduced the amount of cooking oil in oil tanks to be in line with other reagent tanks." diff --git a/icons/obj/random.dmi b/icons/obj/random.dmi index 95340e00e91..c91320e8cf0 100644 Binary files a/icons/obj/random.dmi and b/icons/obj/random.dmi differ diff --git a/icons/obj/reagent_dispensers.dmi b/icons/obj/reagent_dispensers.dmi index d65f46ed8f5..6b299ad2b7c 100644 Binary files a/icons/obj/reagent_dispensers.dmi and b/icons/obj/reagent_dispensers.dmi differ