diff --git a/code/game/objects/items/contraband_vr.dm b/code/game/objects/items/contraband_vr.dm index a4ab63151d9..ac71b7f45e8 100644 --- a/code/game/objects/items/contraband_vr.dm +++ b/code/game/objects/items/contraband_vr.dm @@ -2,7 +2,7 @@ name = "stolen package" desc = "What's in the box?" icon = 'icons/obj/storage.dmi' - icon_state = "deliverycrate4" + icon_state = "deliverycrate5" item_state = "table_parts" w_class = 5 @@ -21,55 +21,63 @@ usr << "The box contained nothing!" return */ - var/loot = pick(/obj/random/contraband, - /obj/random/contraband, - /obj/item/weapon/book/manual/engineering_hacking, - /obj/item/device/chameleon, - /obj/item/weapon/contraband/poster, - /obj/item/seeds/ambrosiadeusseed, - /obj/item/seeds/ambrosiavulgarisseed, - /obj/item/seeds/libertymycelium, - /obj/item/xenos_claw, - /obj/item/weapon/reagent_containers/food/snacks/xenomeat, - /obj/item/weapon/reagent_containers/food/snacks/clownstears, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + var/loot = pick(/obj/effect/landmark/costume, /obj/item/clothing/glasses/thermal, /obj/item/clothing/gloves/combat, /obj/item/clothing/head/bearpelt, /obj/item/clothing/mask/balaclava, - /obj/item/weapon/storage/fancy/cigar/havana, /obj/item/clothing/mask/horsehead, /obj/item/clothing/mask/muzzle, - /obj/item/weapon/storage/toolbox/syndicate, - /obj/item/weapon/stamp/centcomm, - /obj/item/weapon/stamp/solgov, - /obj/item/weapon/storage/bible/booze, - /obj/item/weapon/pen/reagent/paralysis, - /obj/item/weapon/grenade/flashbang/clusterbang, - /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, - /obj/item/weapon/reagent_containers/glass/beaker/neurotoxin, - /obj/item/weapon/grenade/flashbang/clusterbang, - /obj/item/weapon/grenade/spawnergrenade/spesscarp, - /obj/item/weapon/card/emag, - /obj/item/weapon/card/emag_broken, - /obj/item/device/pda/syndicate, - /obj/item/weapon/shield/energy, - /obj/item/weapon/melee/energy/sword, - /obj/item/weapon/melee/telebaton, - /obj/item/weapon/melee/classic_baton, /obj/item/clothing/suit/armor/heavy, - /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/laserproof, - /obj/random/weapon/guarenteed, - /obj/item/weapon/material/knuckledusters, - /obj/effect/landmark/costume, + /obj/item/clothing/suit/armor/vest, + /obj/item/device/chameleon, + /obj/item/device/pda/clown, + /obj/item/device/pda/mime, + /obj/item/device/pda/syndicate, /obj/item/mecha_parts/chassis/phazon, - /obj/item/mecha_parts/part/phazon_torso, /obj/item/mecha_parts/part/phazon_head, /obj/item/mecha_parts/part/phazon_left_arm, - /obj/item/mecha_parts/part/phazon_right_arm, /obj/item/mecha_parts/part/phazon_left_leg, - /obj/item/mecha_parts/part/phazon_right_leg) + /obj/item/mecha_parts/part/phazon_right_arm, + /obj/item/mecha_parts/part/phazon_right_leg, + /obj/item/mecha_parts/part/phazon_torso, + /obj/item/seeds/ambrosiadeusseed, + /obj/item/seeds/ambrosiavulgarisseed, + /obj/item/seeds/libertymycelium, + /obj/item/stack/material/platinum/fifty, + /obj/item/toy/nanotrasenballoon, + /obj/item/toy/syndicateballoon, + /obj/item/weapon/aiModule/syndicate, + /obj/item/weapon/book/manual/engineering_hacking, + /obj/item/weapon/card/emag, + /obj/item/weapon/card/emag_broken, + /obj/item/weapon/card/id/syndicate, + /obj/item/weapon/contraband/poster, + /obj/item/weapon/disposable_teleporter, + /obj/item/weapon/grenade/flashbang/clusterbang, + /obj/item/weapon/grenade/flashbang/clusterbang, + /obj/item/weapon/grenade/spawnergrenade/spesscarp, + /obj/item/weapon/melee/energy/sword, + /obj/item/weapon/melee/telebaton, + /obj/item/weapon/pen/reagent/paralysis, + /obj/item/weapon/pickaxe/diamonddrill, + /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + /obj/item/weapon/reagent_containers/food/snacks/clownstears, + /obj/item/weapon/reagent_containers/food/snacks/xenomeat, + /obj/item/weapon/reagent_containers/glass/beaker/neurotoxin, + /obj/item/weapon/rig/combat/equipped, + /obj/item/weapon/shield/energy, + /obj/item/weapon/stamp/centcomm, + /obj/item/weapon/stamp/solgov, + /obj/item/weapon/storage/fancy/cigar/havana, + /obj/item/xenos_claw, + /obj/random/contraband, + /obj/random/contraband, + /obj/random/contraband, + /obj/random/contraband, + /obj/random/weapon/guarenteed) new loot(usr.loc) usr << "You unwrap the package." del(src) diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm index 3bea0bea48c..fccab274da1 100644 --- a/code/game/objects/random/random_vr.dm +++ b/code/game/objects/random/random_vr.dm @@ -64,15 +64,17 @@ prob(6);/obj/item/weapon/gun/energy/lasercannon,\ prob(5);/obj/item/weapon/gun/projectile/automatic/carbine,\ prob(5);/obj/item/weapon/gun/energy/pulse_rifle,\ - prob(4);/obj/item/weapon/gun/projectile/automatic/battlerifle,\ + /* prob(4);/obj/item/weapon/gun/projectile/automatic/battlerifle,\ */ prob(3);/obj/item/weapon/gun/projectile/deagle/camo,\ prob(3);/obj/item/weapon/gun/energy/gun/nuclear,\ prob(2);/obj/item/weapon/gun/projectile/deagle/gold,\ prob(1);/obj/item/weapon/gun/launcher/rocket,\ + prob(1);/obj/item/weapon/gun/launcher/grenade,\ prob(1);/obj/item/weapon/gun/projectile/gyropistol,\ prob(1);/obj/item/weapon/gun/projectile/heavysniper,\ prob(1);/obj/item/weapon/plastique,\ prob(1);/obj/item/weapon/material/sword,\ + prob(1);/obj/item/weapon/cane/concealed,\ prob(1);/obj/item/weapon/material/sword/katana) /obj/random/weapon/guarenteed @@ -117,7 +119,8 @@ prob(3);/obj/item/ammo_magazine/s762,\ prob(2);/obj/item/ammo_magazine/a50,\ prob(2);/obj/item/ammo_magazine/a762,\ - prob(1);/obj/item/ammo_magazine/battlerifle,\ + prob(1);/obj/item/weapon/storage/box/frags,\ + /* prob(1);/obj/item/ammo_magazine/battlerifle,\ */ prob(1);/obj/item/ammo_casing/rocket,\ prob(1);/obj/item/weapon/storage/box/sniperammo,\ prob(1);/obj/item/ammo_magazine/stg,\