diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index a7c46e7f..bbf5d97c 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -26,31 +26,151 @@ new/obj/item/weapon/pickaxe/plasmacutter(src) if(7 to 8) for(var/i = 0, i < 2, i++) - new/obj/item/weapon/pickaxe/drill(src) + new/obj/item/weapon/ore/diamond(src) if(9) - for(var/i = 0, i < 3, i++) - new/obj/machinery/portable_atmospherics/hydroponics(src) - if(10) - for(var/i = 0, i < 3, i++) - new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src) - if(11 to 13) - new/obj/item/weapon/melee/classic_baton(src) - if(14) - return - if(15) - new/obj/item/clothing/under/chameleon(src) - for(var/i = 0, i < 7, i++) - new/obj/item/clothing/tie/horrible(src) - 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(17 to 29) - return - //Dummy crates end here. - if(30) - new/obj/item/weapon/melee/baton(src) + new/obj/item/weapon/pickaxe/drill(src) + if(10 to 12) + for(var/i = 0, i < 5, i++) + new/obj/item/seeds/lemonseed(src) + if(13 to 16) + var/seeds = rand(1,15) + switch(seeds) + if(1 to 3) + new/obj/item/seeds/nettleseed(src) + if(4 to 8) + new/obj/item/seeds/berryseed(src) + new/obj/item/seeds/berryseed(src) + new/obj/item/seeds/berryseed(src) + if(9 to 12) + new/obj/item/seeds/appleseed(src) + new/obj/item/seeds/appleseed(src) + new/obj/item/seeds/appleseed(src) + if(13) + new/obj/item/seeds/bluespacetomatoseed(src) + if(14) + new/obj/item/seeds/sugarcaneseed(src) + if(15) + new/obj/item/seeds/plastiseed(src) + if(17) + new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src) + if(18) + new/obj/item/bluespace_crystal(src) + if(prob(10)) + new/obj/item/bluespace_crystal(src) + if(19) + new/obj/item/seeds/kudzuseed(src) + if(20) + new/obj/item/weapon/shield/energy(src) + if(21) + new/obj/item/weapon/coin/iron(src) + if(prob(25)) + new/obj/item/weapon/coin/silver(src) + if(22) + if(prob(10)) + new/obj/item/weapon/coin/adamantine(src) + new/obj/item/weapon/coin/gold(src) + else + new/obj/item/weapon/paper/crumpled(src) + if(23 to 25) + var/nutrient = rand(1,3) + switch(nutrient) + if(1) + new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src) + new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src) + new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src) + if(2) + new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src) + new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src) + new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src) + if(3) + new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src) + new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src) + new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src) + if(26 to 30) + for(var/i = 0, i < 5, i++) + new/obj/item/stack/sheet/metal(src) + if(31 to 35) + for(var/i = 0, i < 5, i++) + new/obj/item/stack/sheet/glass(src) + if(36 to 37) + new/obj/item/stack/sheet/glass/plasmaglass(src) + new/obj/item/stack/sheet/glass/plasmaglass(src) + if(38 to 39) + new/obj/item/stack/sheet/plasteel(src) + new/obj/item/stack/sheet/plasteel(src) + if(40 to 45) + new/obj/item/stack/rods(src) + new/obj/item/stack/rods(src) + new/obj/item/stack/rods(src) + new/obj/item/weapon/shard(src) + new/obj/item/weapon/shard(src) + new/obj/item/weapon/shard(src) + if(46) + new/obj/item/weapon/storage/belt/champion(src) + if(47) + new/obj/item/weapon/rcd_ammo(src) + new/obj/item/weapon/rcd_ammo(src) + new/obj/item/weapon/rcd_ammo(src) + if(prob(10)) + new/obj/item/weapon/rcd(src) + if(48) + var/pills = rand(1,15) + switch(pills) + if(1 to 4) + new/obj/item/weapon/storage/pill_bottle/antitox(src) + if(5 to 8) + new/obj/item/weapon/storage/pill_bottle/inaprovaline(src) + if(9 to 12) + new/obj/item/weapon/storage/pill_bottle/kelotane(src) + if(13) + new/obj/item/weapon/storage/pill_bottle/dice(src) + if(14) + new/obj/item/weapon/storage/pill_bottle/happy(src) + if(15) + new/obj/item/weapon/storage/pill_bottle/zoom(src) + if(49 to 52) + var/cash = rand(1,7) + switch(cash) + if(1 to 3) + new/obj/item/weapon/spacecash/c10(src) + new/obj/item/weapon/spacecash/c1(src) + new/obj/item/weapon/spacecash/c1(src) + new/obj/item/weapon/spacecash/c1(src) + if(4 to 6) + new/obj/item/weapon/spacecash/c20(src) + if(7) + new/obj/item/weapon/spacecash/c50(src) + if(53) + if(prob(15)) + new/obj/item/weapon/spacecash/c500(src) + else + new/obj/item/weapon/spacecash/c1(src) + if(54 to 60) + if(prob(50)) + new/obj/item/weapon/ore/strangerock(src) + new/obj/item/weapon/ore/strangerock(src) + new/obj/item/weapon/ore/strangerock(src) + new/obj/item/weapon/ore/slag(src) + new/obj/item/weapon/ore/slag(src) + else + new/obj/item/weapon/ore/gold(src) + new/obj/item/weapon/shard(src) + if(61 to 62) + new/obj/item/weapon/paper/crumpled/bloody(src) + var/gibs = rand(1,4) + switch(gibs) + if(1) + new/obj/item/weapon/organ/r_leg(src) + new/obj/item/weapon/organ/l_arm(src) + if(2) + new/obj/item/weapon/organ/head(src) + new/obj/item/weapon/organ/l_hand(src) + if(3) + new/obj/item/weapon/organ/r_foot(src) + new/obj/item/weapon/organ/r_arm(src) + if(4) + new/obj/item/weapon/organ/l_leg(src) + new/obj/item/weapon/organ/head(src) //Code modified to make things less boomy, and offer more chances with more difficulty. /obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 2a029b42..afe14ead 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -11,14 +11,13 @@ var/machinedir = EAST var/show_all_ores = 0 -/obj/machinery/mineral/processing_unit_console/New() +/obj/machinery/mineral/processing_unit_console/initialize() ..() - spawn(7) - src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) - if (machine) - machine.console = src - else - del(src) + src.machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) + if (machine) + machine.console = src + else + del(src) /obj/machinery/mineral/processing_unit_console/attack_hand(mob/user) add_fingerprint(user) diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index b974a57a..f6694de5 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -9,16 +9,14 @@ var/obj/machinery/mineral/stacking_machine/machine = null var/machinedir = SOUTHEAST -/obj/machinery/mineral/stacking_unit_console/New() +/obj/machinery/mineral/stacking_unit_console/initialize() ..() - - spawn(7) - src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) - if (machine) - machine.console = src - else - del(src) + src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) + if (machine) + machine.console = src + else + del(src) /obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user) add_fingerprint(user) @@ -95,13 +93,8 @@ stack_paths["plasteel"] = /obj/item/stack/sheet/plasteel spawn( 5 ) - for (var/dir in cardinal) - src.input = locate(/obj/machinery/mineral/input, get_step(src, dir)) - if(src.input) break - for (var/dir in cardinal) - src.output = locate(/obj/machinery/mineral/output, get_step(src, dir)) - if(src.output) break - return + src.input = locate(/obj/machinery/mineral/input) in range(1) + src.output = locate(/obj/machinery/mineral/output) in range(1) return /obj/machinery/mineral/stacking_machine/process() @@ -126,6 +119,7 @@ S.amount = stack_amt stack_storage[sheet] -= stack_amt - console.updateUsrDialog() + if(console) + console.updateUsrDialog() return diff --git a/code/modules/mining/minerals.dm b/code/modules/mining/minerals.dm index 3a87144a..9faa4e62 100644 --- a/code/modules/mining/minerals.dm +++ b/code/modules/mining/minerals.dm @@ -65,8 +65,8 @@ var/list/name_to_mineral spread_chance = 10 ore = /obj/item/weapon/ore/silver -/mineral/phoron - name = "Phoron" +/mineral/plasma + name = "Plasma" result_amount = 5 spread_chance = 25 ore = /obj/item/weapon/ore/plasma diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index a2d1cc78..75ba2e54 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -9,6 +9,7 @@ name = "Bananium ore" icon_state = "Clown ore" origin_tech = "materials=4" + oretag = "clown" /obj/item/weapon/ore/uranium name = "pitchblende" diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index b3689d3a..1e860b2a 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -23,10 +23,10 @@ compresses_to = /obj/item/stack/sheet/mineral/sandstone oretag = "sand" -/datum/ore/phoron +/datum/ore/plasma //smelts_to = something that explodes violently on the conveyor, huhuhuhu compresses_to = /obj/item/stack/sheet/mineral/phoron - oretag = "phoron" + oretag = "plasma" /datum/ore/silver smelts_to = /obj/item/stack/sheet/mineral/silver @@ -50,3 +50,7 @@ smelts_to = /obj/item/stack/sheet/mineral/tritium compresses_to = /obj/item/stack/sheet/mineral/mhydrogen oretag = "hydrogen" + +/datum/ore/clown + smelts_to = /obj/item/stack/sheet/mineral/clown + oretag = "clown" diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index e984d192..5e23e607 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index a3b6b38b..f621d437 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ