diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index fc6615fcf03..c891c7af251 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -42,12 +42,14 @@ icon = 'icons/obj/items.dmi' icon_state = "welder" item_to_spawn() - return pick(/obj/item/weapon/screwdriver,\ - /obj/item/weapon/wirecutters,\ - /obj/item/weapon/weldingtool,\ - /obj/item/weapon/crowbar,\ - /obj/item/weapon/wrench,\ - /obj/item/device/flashlight) + return pick(/obj/item/weapon/screwdriver, + /obj/item/weapon/wirecutters, + /obj/item/weapon/weldingtool, + /obj/item/weapon/weldingtool/largetank, + /obj/item/weapon/crowbar, + /obj/item/weapon/wrench, + /obj/item/device/flashlight, + /obj/item/device/multitool) /obj/random/technology_scanner @@ -56,8 +58,8 @@ icon = 'icons/obj/device.dmi' icon_state = "atmos" item_to_spawn() - return pick(prob(5);/obj/item/device/t_scanner,\ - prob(2);/obj/item/device/radio,\ + return pick(prob(5);/obj/item/device/t_scanner, + prob(2);/obj/item/device/radio, prob(5);/obj/item/device/analyzer) @@ -67,10 +69,9 @@ icon = 'icons/obj/power.dmi' icon_state = "cell" item_to_spawn() - return pick(prob(10);/obj/item/weapon/cell/crap,\ - prob(40);/obj/item/weapon/cell,\ - prob(40);/obj/item/weapon/cell/high,\ - prob(9);/obj/item/weapon/cell/super,\ + return pick(prob(50);/obj/item/weapon/cell, + prob(40);/obj/item/weapon/cell/high, + prob(9);/obj/item/weapon/cell/super, prob(1);/obj/item/weapon/cell/hyper) @@ -80,9 +81,10 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "signaller" item_to_spawn() - return pick(/obj/item/device/assembly/igniter,\ - /obj/item/device/assembly/prox_sensor,\ - /obj/item/device/assembly/signaler,\ + return pick(/obj/item/device/assembly/igniter, + /obj/item/device/assembly/prox_sensor, + /obj/item/device/assembly/signaler, + /obj/item/device/assembly/timer, /obj/item/device/multitool) @@ -92,9 +94,10 @@ icon = 'icons/obj/storage.dmi' icon_state = "red" item_to_spawn() - return pick(prob(3);/obj/item/weapon/storage/toolbox/mechanical,\ - prob(2);/obj/item/weapon/storage/toolbox/electrical,\ - prob(1);/obj/item/weapon/storage/toolbox/emergency) + return pick(prob(6);/obj/item/weapon/storage/toolbox/mechanical, + prob(6);/obj/item/weapon/storage/toolbox/electrical, + prob(2);/obj/item/weapon/storage/toolbox/emergency, + prob(1);/obj/item/weapon/storage/toolbox/syndicate) /obj/random/tech_supply @@ -102,41 +105,53 @@ desc = "This is a random piece of technology supplies." icon = 'icons/obj/power.dmi' icon_state = "cell" - spawn_nothing_percentage = 50 + spawn_nothing_percentage = 25 item_to_spawn() - return pick(prob(3);/obj/random/powercell,\ - prob(2);/obj/random/technology_scanner,\ - prob(1);/obj/item/weapon/packageWrap,\ - prob(2);/obj/random/bomb_supply,\ - prob(1);/obj/item/weapon/extinguisher,\ - prob(1);/obj/item/clothing/gloves/fyellow,\ - prob(3);/obj/item/stack/cable_coil/random,\ - prob(2);/obj/random/toolbox,\ - prob(2);/obj/item/weapon/storage/belt/utility,\ - prob(5);/obj/random/tool,\ - prob(2);/obj/item/weapon/tape_roll) + return pick(prob(3);/obj/random/powercell, + prob(2);/obj/random/technology_scanner, + prob(1);/obj/item/weapon/packageWrap, + prob(2);/obj/random/bomb_supply, + prob(1);/obj/item/weapon/extinguisher, + prob(1);/obj/item/clothing/gloves/fyellow, + prob(3);/obj/item/stack/cable_coil/random, + prob(2);/obj/random/toolbox, + prob(2);/obj/item/weapon/storage/belt/utility, + prob(1);/obj/item/weapon/storage/belt/utility/full, + prob(5);/obj/random/tool, + prob(2);/obj/item/weapon/tape_roll, + prob(2);/obj/item/taperoll/engineering, + prob(1);/obj/item/taperoll/atmos, + prob(1);/obj/item/device/flashlight/maglight) /obj/random/medical name = "Random Medicine" desc = "This is a random medical item." icon = 'icons/obj/items.dmi' icon_state = "brutepack" - spawn_nothing_percentage = 25 + spawn_nothing_percentage = 12.5 item_to_spawn() - return pick(prob(4);/obj/item/stack/medical/bruise_pack,\ - prob(4);/obj/item/stack/medical/ointment,\ - prob(2);/obj/item/stack/medical/advanced/bruise_pack,\ - prob(2);/obj/item/stack/medical/advanced/ointment,\ - prob(1);/obj/item/stack/medical/splint,\ - prob(2);/obj/item/bodybag,\ - prob(1);/obj/item/bodybag/cryobag,\ - prob(2);/obj/item/weapon/storage/pill_bottle/kelotane,\ - prob(2);/obj/item/weapon/storage/pill_bottle/antitox,\ - prob(2);/obj/item/weapon/storage/pill_bottle/tramadol,\ - prob(2);/obj/item/weapon/reagent_containers/syringe/antitoxin,\ - prob(1);/obj/item/weapon/reagent_containers/syringe/antiviral,\ - prob(2);/obj/item/weapon/reagent_containers/syringe/inaprovaline,\ - prob(1);/obj/item/stack/nanopaste) + return pick(prob(8);/obj/item/stack/medical/bruise_pack, + prob(8);/obj/item/stack/medical/ointment, + prob(4);/obj/item/stack/medical/advanced/bruise_pack, + prob(4);/obj/item/stack/medical/advanced/ointment, + prob(2);/obj/item/stack/medical/splint, + prob(4);/obj/item/bodybag, + prob(2);/obj/item/bodybag/cryobag, + prob(4);/obj/item/weapon/storage/pill_bottle/kelotane, + prob(4);/obj/item/weapon/storage/pill_bottle/dylovene, + prob(4);/obj/item/weapon/storage/pill_bottle/tramadol, + prob(1);/obj/item/weapon/storage/pill_bottle/spaceacillin, + prob(1);/obj/item/weapon/storage/pill_bottle/tramadol, + prob(0.2);/obj/item/weapon/storage/pill_bottle/dermaline, + prob(0.2);/obj/item/weapon/storage/pill_bottle/dexalin_plus, + prob(0.2);/obj/item/weapon/storage/pill_bottle/bicaridine, + prob(4);/obj/item/weapon/reagent_containers/syringe/antitoxin, + prob(2);/obj/item/weapon/reagent_containers/syringe/antiviral, + prob(4);/obj/item/weapon/reagent_containers/syringe/inaprovaline, + prob(4);/obj/item/weapon/reagent_containers/hypospray/autoinjector, + prob(0.1);/obj/item/weapon/reagent_containers/hypospray, + prob(1);/obj/item/device/healthanalyzer, + prob(2);/obj/item/stack/nanopaste) /obj/random/firstaid @@ -145,10 +160,10 @@ icon = 'icons/obj/storage.dmi' icon_state = "firstaid" item_to_spawn() - return pick(prob(3);/obj/item/weapon/storage/firstaid/regular,\ - prob(2);/obj/item/weapon/storage/firstaid/toxin,\ - prob(2);/obj/item/weapon/storage/firstaid/o2,\ - prob(1);/obj/item/weapon/storage/firstaid/adv,\ + return pick(prob(3);/obj/item/weapon/storage/firstaid/regular, + prob(2);/obj/item/weapon/storage/firstaid/toxin, + prob(2);/obj/item/weapon/storage/firstaid/o2, + prob(1);/obj/item/weapon/storage/firstaid/adv, prob(2);/obj/item/weapon/storage/firstaid/fire) @@ -159,17 +174,22 @@ icon_state = "purplecomb" spawn_nothing_percentage = 50 item_to_spawn() - return pick(prob(3);/obj/item/weapon/storage/pill_bottle/tramadol,\ - prob(4);/obj/item/weapon/haircomb,\ - prob(2);/obj/item/weapon/storage/pill_bottle/happy,\ - prob(2);/obj/item/weapon/storage/pill_bottle/zoom,\ - prob(5);/obj/item/weapon/contraband/poster,\ - prob(2);/obj/item/weapon/material/butterfly,\ - prob(3);/obj/item/weapon/material/butterflyblade,\ - prob(3);/obj/item/weapon/material/butterflyhandle,\ - prob(3);/obj/item/weapon/material/wirerod,\ - prob(1);/obj/item/weapon/material/butterfly/switchblade,\ - prob(1);/obj/item/weapon/reagent_containers/syringe/drugs) + return pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol, + prob(8);/obj/item/weapon/haircomb, + prob(4);/obj/item/weapon/storage/pill_bottle/happy, + prob(4);/obj/item/weapon/storage/pill_bottle/zoom, + prob(10);/obj/item/weapon/contraband/poster, + prob(4);/obj/item/weapon/material/butterfly, + prob(6);/obj/item/weapon/material/butterflyblade, + prob(6);/obj/item/weapon/material/butterflyhandle, + prob(6);/obj/item/weapon/material/wirerod, + prob(2);/obj/item/weapon/material/butterfly/switchblade, + prob(2);/obj/item/weapon/material/knuckledusters, + prob(1);/obj/item/weapon/material/hatchet/tacknife, + prob(0.5);/obj/item/weapon/beartrap, + prob(1);/obj/item/weapon/handcuffs, + prob(1);/obj/item/weapon/legcuffs, + prob(2);/obj/item/weapon/reagent_containers/syringe/drugs) /obj/random/energy @@ -178,9 +198,8 @@ icon = 'icons/obj/gun.dmi' icon_state = "energykill100" item_to_spawn() - return pick(prob(2);/obj/item/weapon/gun/energy/laser,\ - prob(2);/obj/item/weapon/gun/energy/gun,\ - prob(1);/obj/item/weapon/gun/energy/stunrevolver) + return pick(prob(2);/obj/item/weapon/gun/energy/laser, + prob(2);/obj/item/weapon/gun/energy/gun) /obj/random/projectile name = "Random Projectile Weapon" @@ -188,8 +207,8 @@ icon = 'icons/obj/gun.dmi' icon_state = "revolver" item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,\ - prob(2);/obj/item/weapon/gun/projectile/automatic/wt550,\ + return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump, + prob(2);/obj/item/weapon/gun/projectile/automatic/wt550, prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat) /obj/random/handgun @@ -198,7 +217,7 @@ icon = 'icons/obj/gun.dmi' icon_state = "secgundark" item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/projectile/sec,\ + return pick(prob(3);/obj/item/weapon/gun/projectile/sec, prob(1);/obj/item/weapon/gun/projectile/sec/wood) @@ -208,14 +227,14 @@ icon = 'icons/obj/ammo.dmi' icon_state = "45-10" item_to_spawn() - return pick(prob(6);/obj/item/weapon/storage/box/beanbags,\ - prob(2);/obj/item/weapon/storage/box/shotgunammo,\ - prob(4);/obj/item/weapon/storage/box/shotgunshells,\ - prob(1);/obj/item/weapon/storage/box/stunshells,\ - prob(2);/obj/item/ammo_magazine/c45m,\ - prob(4);/obj/item/ammo_magazine/c45m/rubber,\ - prob(4);/obj/item/ammo_magazine/c45m/flash,\ - prob(2);/obj/item/ammo_magazine/mc9mmt,\ + return pick(prob(6);/obj/item/weapon/storage/box/beanbags, + prob(2);/obj/item/weapon/storage/box/shotgunammo, + prob(4);/obj/item/weapon/storage/box/shotgunshells, + prob(1);/obj/item/weapon/storage/box/stunshells, + prob(2);/obj/item/ammo_magazine/c45m, + prob(4);/obj/item/ammo_magazine/c45m/rubber, + prob(4);/obj/item/ammo_magazine/c45m/flash, + prob(2);/obj/item/ammo_magazine/mc9mmt, prob(6);/obj/item/ammo_magazine/mc9mmt/rubber) @@ -225,43 +244,43 @@ icon = 'icons/obj/toy.dmi' icon_state = "assistant" item_to_spawn() - return pick(/obj/item/toy/figure/cmo,\ - /obj/item/toy/figure/assistant,\ - /obj/item/toy/figure/atmos,\ - /obj/item/toy/figure/bartender,\ - /obj/item/toy/figure/borg,\ - /obj/item/toy/figure/gardener,\ - /obj/item/toy/figure/captain,\ - /obj/item/toy/figure/cargotech,\ - /obj/item/toy/figure/ce,\ - /obj/item/toy/figure/chaplain,\ - /obj/item/toy/figure/chef,\ - /obj/item/toy/figure/chemist,\ - /obj/item/toy/figure/clown,\ - /obj/item/toy/figure/corgi,\ - /obj/item/toy/figure/detective,\ - /obj/item/toy/figure/dsquad,\ - /obj/item/toy/figure/engineer,\ - /obj/item/toy/figure/geneticist,\ - /obj/item/toy/figure/hop,\ - /obj/item/toy/figure/hos,\ - /obj/item/toy/figure/qm,\ - /obj/item/toy/figure/janitor,\ - /obj/item/toy/figure/agent,\ - /obj/item/toy/figure/librarian,\ - /obj/item/toy/figure/md,\ - /obj/item/toy/figure/mime,\ - /obj/item/toy/figure/miner,\ - /obj/item/toy/figure/ninja,\ - /obj/item/toy/figure/wizard,\ - /obj/item/toy/figure/rd,\ - /obj/item/toy/figure/roboticist,\ - /obj/item/toy/figure/scientist,\ - /obj/item/toy/figure/syndie,\ - /obj/item/toy/figure/secofficer,\ - /obj/item/toy/figure/warden,\ - /obj/item/toy/figure/psychologist,\ - /obj/item/toy/figure/paramedic,\ + return pick(/obj/item/toy/figure/cmo, + /obj/item/toy/figure/assistant, + /obj/item/toy/figure/atmos, + /obj/item/toy/figure/bartender, + /obj/item/toy/figure/borg, + /obj/item/toy/figure/gardener, + /obj/item/toy/figure/captain, + /obj/item/toy/figure/cargotech, + /obj/item/toy/figure/ce, + /obj/item/toy/figure/chaplain, + /obj/item/toy/figure/chef, + /obj/item/toy/figure/chemist, + /obj/item/toy/figure/clown, + /obj/item/toy/figure/corgi, + /obj/item/toy/figure/detective, + /obj/item/toy/figure/dsquad, + /obj/item/toy/figure/engineer, + /obj/item/toy/figure/geneticist, + /obj/item/toy/figure/hop, + /obj/item/toy/figure/hos, + /obj/item/toy/figure/qm, + /obj/item/toy/figure/janitor, + /obj/item/toy/figure/agent, + /obj/item/toy/figure/librarian, + /obj/item/toy/figure/md, + /obj/item/toy/figure/mime, + /obj/item/toy/figure/miner, + /obj/item/toy/figure/ninja, + /obj/item/toy/figure/wizard, + /obj/item/toy/figure/rd, + /obj/item/toy/figure/roboticist, + /obj/item/toy/figure/scientist, + /obj/item/toy/figure/syndie, + /obj/item/toy/figure/secofficer, + /obj/item/toy/figure/warden, + /obj/item/toy/figure/psychologist, + /obj/item/toy/figure/paramedic, /obj/item/toy/figure/ert) @@ -271,12 +290,12 @@ icon = 'icons/obj/toy.dmi' icon_state = "nymphplushie" item_to_spawn() - return pick(/obj/structure/plushie/ian,\ - /obj/structure/plushie/drone,\ - /obj/structure/plushie/carp,\ - /obj/structure/plushie/beepsky,\ - /obj/item/toy/plushie/nymph,\ - /obj/item/toy/plushie/mouse,\ - /obj/item/toy/plushie/kitten,\ + return pick(/obj/structure/plushie/ian, + /obj/structure/plushie/drone, + /obj/structure/plushie/carp, + /obj/structure/plushie/beepsky, + /obj/item/toy/plushie/nymph, + /obj/item/toy/plushie/mouse, + /obj/item/toy/plushie/kitten, /obj/item/toy/plushie/lizard) diff --git a/html/changelogs/Yoshax - RandomItems.yml b/html/changelogs/Yoshax - RandomItems.yml new file mode 100644 index 00000000000..e462ae02b56 --- /dev/null +++ b/html/changelogs/Yoshax - RandomItems.yml @@ -0,0 +1,13 @@ +# Your name. +author: Yoshax + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Stun Revolvers will no longer be able to spawn from random energy weapon spawns. In addition, some of the other random item spawns have new items and adjusted probablities."