diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 37a87972743..ca0602f40d5 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -9,6 +9,7 @@ var/lastattempt = null var/attempts = 10 var/codelen = 4 + var/qdel_on_open = FALSE tamperproof = 90 /obj/structure/closet/crate/secure/loot/Initialize() @@ -24,42 +25,41 @@ switch(loot) if(1 to 5) //5% chance new /obj/item/reagent_containers/food/drinks/bottle/rum(src) - new /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus(src) + new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src) new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src) new /obj/item/lighter(src) + new /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium(src) + new /obj/item/clothing/mask/cigarette/rollie(src) + new /obj/item/clothing/mask/cigarette/rollie(src) + new /obj/item/clothing/mask/cigarette/rollie(src) if(6 to 10) - new /obj/item/bedsheet(src) - new /obj/item/kitchen/knife(src) - new /obj/item/wirecutters(src) - new /obj/item/screwdriver(src) - new /obj/item/weldingtool(src) - new /obj/item/hatchet(src) - new /obj/item/crowbar(src) + new /obj/item/melee/skateboard/pro(src) if(11 to 15) - new /obj/item/reagent_containers/glass/beaker/bluespace(src) + new /mob/living/simple_animal/bot/honkbot(src) if(16 to 20) new /obj/item/stack/ore/diamond(src, 10) if(21 to 25) for(var/i in 1 to 5) new /obj/item/poster/random_contraband(src) if(26 to 30) - for(var/i in 1 to 3) - new /obj/item/reagent_containers/glass/beaker/noreact(src) + new /obj/item/vending_refill/sovietsoda(src) + new /obj/item/circuitboard/machine/vending(src) if(31 to 35) new /obj/item/seeds/firelemon(src) if(36 to 40) - new /obj/item/melee/baton(src) + new /obj/item/toy/snappop/phoenix(src) + new /obj/item/toy/snappop/phoenix(src) + new /obj/item/toy/snappop/phoenix(src) + new /obj/item/toy/snappop/phoenix(src) + new /obj/item/toy/snappop/phoenix(src) if(41 to 45) - new /obj/item/clothing/under/shorts/red(src) - new /obj/item/clothing/under/shorts/blue(src) + new /obj/item/pda/clear(src) if(46 to 50) - new /obj/item/clothing/under/chameleon(src) - for(var/i in 1 to 7) - new /obj/item/clothing/neck/tie/horrible(src) + new /obj/item/storage/box/syndie_kit/chameleon/broken if(51 to 52) // 2% chance new /obj/item/melee/classic_baton(src) if(53 to 54) - new /obj/item/toy/balloon(src) + new /obj/item/toy/balloon/corgi(src) if(55 to 56) var/newitem = pick(subtypesof(/obj/item/toy/prize)) new newitem(src) @@ -74,81 +74,72 @@ new /obj/item/clothing/head/kitty(src) new /obj/item/clothing/neck/petcollar(src) if(63 to 64) - for(var/i in 1 to rand(4, 7)) - var/newcoin = pick(/obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/plasma, /obj/item/coin/uranium) - new newcoin(src) + new /obj/item/clothing/shoes/kindleKicks(src) if(65 to 66) new /obj/item/clothing/suit/ianshirt(src) new /obj/item/clothing/suit/hooded/ian_costume(src) if(67 to 68) - for(var/i in 1 to rand(4, 7)) - var/newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace) - new newitem(src) + new /obj/item/toy/plush/awakenedplushie(src) if(69 to 70) new /obj/item/stack/ore/bluespace_crystal(src, 5) if(71 to 72) - new /obj/item/pickaxe/drill(src) + new /obj/item/toy/plush/snakeplushie(src) if(73 to 74) - new /obj/item/pickaxe/drill/jackhammer(src) + new /mob/living/simple_animal/pet/gondola(src) if(75 to 76) - new /obj/item/pickaxe/diamond(src) + new /obj/item/bikehorn/airhorn(src) if(77 to 78) - new /obj/item/pickaxe/drill/diamonddrill(src) + new /obj/item/toy/plush/lizardplushie(src) if(79 to 80) - new /obj/item/cane(src) - new /obj/item/clothing/head/collectable/tophat(src) + new /obj/item/stack/sheet/mineral/bananium(src, 10) if(81 to 82) - new /obj/item/gun/energy/plasmacutter(src) + new /obj/item/bikehorn/airhorn(src) if(83 to 84) - new /obj/item/toy/katana(src) + new /obj/item/toy/plush/beeplushie(src) if(85 to 86) new /obj/item/defibrillator/compact(src) if(87) //1% chance new /obj/item/weed_extract(src) if(88) - new /obj/item/organ/brain(src) + new /obj/item/reagent_containers/food/drinks/bottle/lizardwine(src) if(89) - new /obj/item/organ/brain/alien(src) + new /obj/item/melee/transforming/energy/sword/bananium(src) if(90) - new /obj/item/organ/heart(src) + new /obj/item/dnainjector/wackymut(src) if(91) - new /obj/item/soulstone/anybody(src) + for(var/i in 1 to 30) + new /mob/living/simple_animal/cockroach(src) if(92) new /obj/item/katana(src) if(93) new /obj/item/dnainjector/xraymut(src) if(94) - new /obj/item/storage/backpack/clown(src) - new /obj/item/clothing/under/rank/civilian/clown(src) - new /obj/item/clothing/shoes/clown_shoes(src) - new /obj/item/pda/clown(src) - new /obj/item/clothing/mask/gas/clown_hat(src) - new /obj/item/bikehorn(src) - new /obj/item/toy/crayon/rainbow(src) - new /obj/item/reagent_containers/spray/waterflower(src) + new /mob/living/simple_animal/hostile/mimic/crate(src) + qdel_on_open = TRUE if(95) - new /obj/item/clothing/under/rank/civilian/mime(src) - new /obj/item/clothing/shoes/sneakers/black(src) - new /obj/item/pda/mime(src) - new /obj/item/clothing/gloves/color/white(src) - new /obj/item/clothing/mask/gas/mime(src) - new /obj/item/clothing/head/beret(src) - new /obj/item/clothing/suit/suspenders(src) - new /obj/item/toy/crayon/mime(src) - new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src) + new /obj/item/toy/plush/nukeplushie(src) if(96) - new /obj/item/hand_tele(src) + new /obj/item/banhammer(src) + new /obj/effect/mine/sound/bwoink(src) + new /obj/effect/mine/sound/bwoink(src) + new /obj/effect/mine/sound/bwoink(src) if(97) - new /obj/item/clothing/mask/balaclava - new /obj/item/gun/ballistic/automatic/pistol(src) - new /obj/item/ammo_box/magazine/m10mm(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/gun/ballistic/shotgun/toy(src) + new /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted(src) + new /obj/item/gun/ballistic/automatic/toy/unrestricted(src) + new /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted(src) + new /obj/item/ammo_box/foambox(src) if(98) - new /obj/item/katana/cursed(src) + for(var/i in 1 to 3) + new /mob/living/simple_animal/hostile/poison/bees/toxin(src) if(99) - new /obj/item/storage/belt/champion(src) - new /obj/item/clothing/mask/luchador(src) + new /obj/item/implanter/sad_trombone(src) if(100) - new /obj/item/clothing/head/bearpelt(src) + new /obj/item/melee/skateboard/hoverboard(src) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/structure/closet/crate/secure/loot/attack_hand(mob/user) @@ -228,6 +219,8 @@ if(locked) boom(user) else + if (qdel_on_open) + qdel(src) ..() /obj/structure/closet/crate/secure/loot/deconstruct(disassembled = TRUE) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 79fc7653eb6..50e9710a76f 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -410,3 +410,4 @@ /obj/item/reagent_containers/glass/bottle/bromine name = "bromine bottle" list_reagents = list(/datum/reagent/bromine = 30) +