From 3007803d076bbcdc70591a295d137489603b3889 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 1 Jan 2014 16:18:56 -0500 Subject: [PATCH] Nerfed abandoned crates to be less fucking moronic --- code/modules/mining/abandonedcrates.dm | 80 +++++++------------------ code/modules/mining/mine_turfs.dm | 2 +- code/modules/mining/unsim_mine_turfs.dm | 2 +- 3 files changed, 25 insertions(+), 59 deletions(-) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 3278fbd7a8b..ce2023db5b1 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -24,77 +24,43 @@ if(2) new/obj/item/weapon/pickaxe/drill(src) new/obj/item/device/taperecorder(src) - new/obj/item/clothing/suit/space/rig(src) - new/obj/item/clothing/head/helmet/space/rig(src) + new/obj/item/clothing/suit/space(src) + new/obj/item/clothing/head/helmet/space(src) if(3) - for(var/i = 0, i < 12, i++) - new/obj/item/weapon/coin/diamond(src) - if(4) - new/obj/item/clothing/shoes/clown_shoes(src) - new/obj/item/clothing/under/rank/clown(src) - new/obj/item/clothing/mask/gas/clown_hat(src) - new/obj/item/weapon/bananapeel(src) - if(5) - for(var/i = 0, i < 6, i++) - new/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake(src) - new/obj/item/weapon/lighter/zippo(src) - if(7) - new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src) - if(9) - for(var/i = 0, i < 5, i++) - new/obj/item/weapon/ore/diamond(src) - if(10) - for(var/i = 0, i < 5, i++) - new/obj/item/weapon/ore/clown(src) - if(11) return - if(12) - new/obj/item/seeds/deathberryseed(src) - new/obj/item/seeds/deathnettleseed(src) - if(13) - new/obj/machinery/hydroponics(src) - if(14) - new/obj/item/seeds/cashseed(src) - if(15) + if(4) + new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src) + if(5 to 6) + for(var/i = 0, i < 10, i++) + new/obj/item/weapon/ore/diamond(src) + if(7) + return + if(8) + return + if(9) + for(var/i = 0, i < 3, i++) + new/obj/machinery/hydroponics(src) + if(10) for(var/i = 0, i < 3, i++) new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src) - new/obj/item/weapon/reagent_containers/hypospray(src) - if(16) - new /obj/item/weapon/storage/pill_bottle/random_meds(src) - if(17) - new/obj/item/mecha_parts/mecha_equipment/weapon/honker(src) - new/obj/item/mecha_parts/chassis/honker(src) - new/obj/item/mecha_parts/part/honker_torso(src) - new/obj/item/mecha_parts/part/honker_head(src) - new/obj/item/mecha_parts/part/honker_left_arm(src) - if(18) + if(11 to 13) + new/obj/item/weapon/melee/classic_baton(src) + if(14) return - if(19) - for(var/i = 0, i < 4, i++) - new/obj/item/weapon/melee/classic_baton(src) - if(20) - new/obj/item/weapon/storage/lockbox/clusterbang(src) - if(21) - new/obj/item/weapon/aiModule/robocop(src) - if(22) + if(15) new/obj/item/clothing/under/chameleon(src) for(var/i = 0, i < 7, i++) new/obj/item/clothing/tie/horrible(src) - if(23) + if(16) new/obj/item/clothing/under/shorts(src) new/obj/item/clothing/under/shorts/red(src) new/obj/item/clothing/under/shorts/blue(src) //Dummy crates start here. - if(24 to 29) - return - if(8) - return - if(6) + if(17 to 29) return //Dummy crates end here. if(30) - for(var/i = 0, i < 4, i++) - new/obj/item/weapon/melee/baton(src) + new/obj/item/weapon/melee/baton(src) /obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob) if(locked) @@ -114,7 +80,7 @@ if (attempts == 0) user << "The crate's anti-tamper system activates!" var/turf/T = get_turf(src.loc) - explosion(T, 0, 1, 2, 1) + explosion(T, 0, 0, 0, 1) del(src) return else diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index fa9145df216..8455b559df9 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -495,7 +495,7 @@ commented out in r5061, I left it because of the shroom thingies var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid) N.fullUpdateMineralOverlays() - var/crate = rand(1,30) + var/crate = rand(1,500) switch(crate) if(1) visible_message("After digging, you find an old dusty crate buried within!") diff --git a/code/modules/mining/unsim_mine_turfs.dm b/code/modules/mining/unsim_mine_turfs.dm index b656adb4e4d..a35c1c1178d 100644 --- a/code/modules/mining/unsim_mine_turfs.dm +++ b/code/modules/mining/unsim_mine_turfs.dm @@ -487,7 +487,7 @@ commented out in r5061, I left it because of the shroom thingies var/turf/unsimulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/unsimulated/floor/plating/airless/asteroid) N.fullUpdateMineralOverlays() - var/crate = rand(1,30) + var/crate = rand(1,500) switch(crate) if(1) visible_message("After digging, you find an old dusty crate buried within!")