From 0258d5be22215667090085b461175e2c681ce999 Mon Sep 17 00:00:00 2001 From: "aranclanos@hotmail.com" Date: Fri, 16 Nov 2012 15:00:09 +0000 Subject: [PATCH] -Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel) -Reduced the chunks of code about minerals in door_assembly.dm Preeeetty much this commit is just to update all the files to the new path of the minerals. From here, if I can, I'll start changing one by one to remove the huge chunks of code. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5087 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/storage.dm | 22 +- code/game/gamemodes/objective.dm | 6 +- code/game/machinery/camera/camera_assembly.dm | 2 +- code/game/machinery/camera/presets.dm | 4 +- code/game/mecha/equipment/tools/tools.dm | 4 +- code/game/mecha/mech_fabricator.dm | 36 +-- .../objects/items/stacks/sheets/mineral.dm | 218 ++++++++++++++---- code/game/objects/structures/door_assembly.dm | 163 +++---------- code/game/turfs/simulated/walls.dm | 4 +- code/modules/mining/machine_processing.dm | 16 +- code/modules/mining/machine_stacking.dm | 48 ++-- code/modules/mining/mint.dm | 14 +- ...{ores_materials_coins.dm => ores_coins.dm} | 138 +---------- code/modules/mining/satchel_ore_boxdm.dm | 14 +- code/modules/mob/living/simple_animal/worm.dm | 8 +- code/modules/power/port_gen.dm | 6 +- code/modules/reagents/Chemistry-Machinery.dm | 10 +- code/modules/reagents/Chemistry-Recipes.dm | 2 +- code/modules/research/circuitprinter.dm | 10 +- code/modules/research/protolathe.dm | 28 +-- code/modules/research/rdconsole.dm | 16 +- code/unused/mining/datum_processing_recipe.dm | 10 +- .../mining/machine_craftlathe_unused.dm | 14 +- code/unused/mining/machine_purifier_unused.dm | 10 +- code/unused/powerarmor/powerarmor.dm | 2 +- maps/tgstation.2.0.9.dmm | 4 +- tgstation.dme | 3 +- 27 files changed, 354 insertions(+), 458 deletions(-) rename code/modules/mining/{ores_materials_coins.dm => ores_coins.dm} (51%) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 7a543e3022..d028564dda 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -520,23 +520,23 @@ //Plasma (rare ore) if(pickednum >= 15) - new /obj/item/stack/sheet/plasma(src, rand(rare_min, rare_max)) + new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max)) //Silver (rare ore) if(pickednum >= 20) - new /obj/item/stack/sheet/silver(src, rand(rare_min, rare_max)) + new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max)) //Gold (rare ore) if(pickednum >= 30) - new /obj/item/stack/sheet/gold(src, rand(rare_min, rare_max)) + new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max)) //Uranium (rare ore) if(pickednum >= 40) - new /obj/item/stack/sheet/uranium(src, rand(rare_min, rare_max)) + new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max)) //Diamond (rare HONK) if(pickednum >= 45) - new /obj/item/stack/sheet/diamond(src, rand(rare_min, rare_max)) + new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max)) //Jetpack (You hit the jackpot!) if(pickednum == 50) @@ -554,12 +554,12 @@ /obj/item/stack/sheet/metal, /obj/item/stack/sheet/glass, - /obj/item/stack/sheet/gold, - /obj/item/stack/sheet/silver, - /obj/item/stack/sheet/plasma, - /obj/item/stack/sheet/uranium, - /obj/item/stack/sheet/diamond, - /obj/item/stack/sheet/clown, + /obj/item/stack/sheet/mineral/gold, + /obj/item/stack/sheet/mineral/silver, + /obj/item/stack/sheet/mineral/plasma, + /obj/item/stack/sheet/mineral/uranium, + /obj/item/stack/sheet/mineral/diamond, + /obj/item/stack/sheet/mineral/clown, /obj/item/stack/sheet/plasteel, /obj/item/stack/rods diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c35c48bcd9..2e8169a704 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -285,9 +285,9 @@ datum/objective/steal "diamond drill" = /obj/item/weapon/pickaxe/diamonddrill, "bag of holding" = /obj/item/weapon/storage/backpack/holding, "hyper-capacity cell" = /obj/item/weapon/cell/hyper, - "10 diamonds" = /obj/item/stack/sheet/diamond, - "50 gold bars" = /obj/item/stack/sheet/gold, - "25 refined uranium bars" = /obj/item/stack/sheet/uranium, + "10 diamonds" = /obj/item/stack/sheet/mineral/diamond, + "50 gold bars" = /obj/item/stack/sheet/mineral/gold, + "25 refined uranium bars" = /obj/item/stack/sheet/mineral/uranium, ) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index ea759a357a..6a4b1fdac2 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -10,7 +10,7 @@ g_amt = 300 // Motion, EMP-Proof, X-Ray - var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/plasma, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot) + var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot) var/list/upgrades = list() var/state = 0 var/busy = 0 diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 3ec4f4b8b5..0ee0e622b8 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -53,7 +53,7 @@ // CHECKS /obj/machinery/camera/proc/isEmpProof() - var/O = locate(/obj/item/stack/sheet/plasma) in assembly.upgrades + var/O = locate(/obj/item/stack/sheet/mineral/plasma) in assembly.upgrades return O /obj/machinery/camera/proc/isXRay() @@ -67,7 +67,7 @@ // UPGRADE PROCS /obj/machinery/camera/proc/upgradeEmpProof() - assembly.upgrades.Add(new /obj/item/stack/sheet/plasma(assembly)) + assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly)) /obj/machinery/camera/proc/upgradeXRay() assembly.upgrades.Add(new /obj/item/weapon/reagent_containers/food/snacks/grown/carrot(assembly)) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 0fb71380e2..1ced2080dc 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -837,7 +837,7 @@ return proc/init() - fuel = new /obj/item/stack/sheet/plasma(src) + fuel = new /obj/item/stack/sheet/mineral/plasma(src) fuel.amount = 0 pr_mech_generator = new /datum/global_iterator/mecha_generator(list(src),0) pr_mech_generator.set_delay(equip_cooldown) @@ -967,7 +967,7 @@ reliability = 1000 init() - fuel = new /obj/item/stack/sheet/uranium(src) + fuel = new /obj/item/stack/sheet/mineral/uranium(src) fuel.amount = 0 pr_mech_generator = new /datum/global_iterator/mecha_generator/nuclear(list(src),0) pr_mech_generator.set_delay(equip_cooldown) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 442e3b9dd8..1ee26fcc24 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -674,17 +674,17 @@ if("glass") type = /obj/item/stack/sheet/glass if("gold") - type = /obj/item/stack/sheet/gold + type = /obj/item/stack/sheet/mineral/gold if("silver") - type = /obj/item/stack/sheet/silver + type = /obj/item/stack/sheet/mineral/silver if("diamond") - type = /obj/item/stack/sheet/diamond + type = /obj/item/stack/sheet/mineral/diamond if("plasma") - type = /obj/item/stack/sheet/plasma + type = /obj/item/stack/sheet/mineral/plasma if("uranium") - type = /obj/item/stack/sheet/uranium + type = /obj/item/stack/sheet/mineral/uranium if("bananium") - type = /obj/item/stack/sheet/clown + type = /obj/item/stack/sheet/mineral/clown else return 0 var/result = 0 @@ -728,22 +728,22 @@ var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc) G.amount = round(src.resources["glass"] / G.perunit) if(src.resources["plasma"] >= 2000) - var/obj/item/stack/sheet/plasma/G = new /obj/item/stack/sheet/plasma(src.loc) + var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc) G.amount = round(src.resources["plasma"] / G.perunit) if(src.resources["silver"] >= 2000) - var/obj/item/stack/sheet/silver/G = new /obj/item/stack/sheet/silver(src.loc) + var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(src.loc) G.amount = round(src.resources["silver"] / G.perunit) if(src.resources["gold"] >= 2000) - var/obj/item/stack/sheet/gold/G = new /obj/item/stack/sheet/gold(src.loc) + var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc) G.amount = round(src.resources["gold"] / G.perunit) if(src.resources["uranium"] >= 2000) - var/obj/item/stack/sheet/uranium/G = new /obj/item/stack/sheet/uranium(src.loc) + var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(src.loc) G.amount = round(src.resources["uranium"] / G.perunit) if(src.resources["diamond"] >= 2000) - var/obj/item/stack/sheet/diamond/G = new /obj/item/stack/sheet/diamond(src.loc) + var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc) G.amount = round(src.resources["diamond"] / G.perunit) if(src.resources["bananium"] >= 2000) - var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown(src.loc) + var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc) G.amount = round(src.resources["bananium"] / G.perunit) del(src) return 1 @@ -756,21 +756,21 @@ return var/material switch(W.type) - if(/obj/item/stack/sheet/gold) + if(/obj/item/stack/sheet/mineral/gold) material = "gold" - if(/obj/item/stack/sheet/silver) + if(/obj/item/stack/sheet/mineral/silver) material = "silver" - if(/obj/item/stack/sheet/diamond) + if(/obj/item/stack/sheet/mineral/diamond) material = "diamond" - if(/obj/item/stack/sheet/plasma) + if(/obj/item/stack/sheet/mineral/plasma) material = "plasma" if(/obj/item/stack/sheet/metal) material = "metal" if(/obj/item/stack/sheet/glass) material = "glass" - if(/obj/item/stack/sheet/clown) + if(/obj/item/stack/sheet/mineral/clown) material = "bananium" - if(/obj/item/stack/sheet/uranium) + if(/obj/item/stack/sheet/mineral/uranium) material = "uranium" else return ..() diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 046127e875..42fe0a3e4c 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -1,24 +1,23 @@ -/* Mineral Sheets - * Contains: - * Sandstone - * Diamond - * Uranium - * Plasma - * Gold - * Silver - */ +/* +Mineral Sheets + Contains: + - Sandstone + - Diamond + - Uranium + - Plasma + - Gold + - Silver + - Clown + Others: + - Adamantine + - Mythril + - Enriched Uranium +*/ /* * Sandstone */ -var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ - new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \ -/* new/datum/stack_recipe("sandstone wall", ???), \ - new/datum/stack_recipe("sandstone floor", ???),\*/ - ) - -/obj/item/stack/sheet/sandstone +/obj/item/stack/sheet/mineral/sandstone name = "sandstone bricks" desc = "This appears to be a combination of both sand and stone." singular_name = "sandstone brick" @@ -28,67 +27,204 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ origin_tech = "materials=1" sheettype = "sandstone" -/obj/item/stack/sheet/sandstone - New(var/loc, var/amount=null) - recipes = sandstone_recipes - return ..() +var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ + new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \ +/* new/datum/stack_recipe("sandstone wall", ???), \ + new/datum/stack_recipe("sandstone floor", ???),\ */ + ) + +/obj/item/stack/sheet/mineral/sandstone/New(var/loc, var/amount=null) + recipes = sandstone_recipes + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() /* * Diamond */ +/obj/item/stack/sheet/mineral/diamond + name = "diamond" + icon_state = "sheet-diamond" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_range = 3 + origin_tech = "materials=6" + perunit = 3750 + sheettype = "diamond" + var/global/list/datum/stack_recipe/diamond_recipes = list ( \ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/diamond - New(var/loc, var/amount=null) - recipes = diamond_recipes - return ..() +/obj/item/stack/sheet/mineral/diamond/New(var/loc, var/amount=null) + recipes = diamond_recipes + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() /* * Uranium */ +/obj/item/stack/sheet/mineral/uranium + name = "uranium" + icon_state = "sheet-uranium" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=5" + perunit = 2000 + sheettype = "uranium" + var/global/list/datum/stack_recipe/uranium_recipes = list ( \ new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/uranium - New(var/loc, var/amount=null) - recipes = uranium_recipes - return ..() +/obj/item/stack/sheet/mineral/uranium/New(var/loc, var/amount=null) + recipes = uranium_recipes + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() /* * Plasma */ +/obj/item/stack/sheet/mineral/plasma + name = "solid plasma" + icon_state = "sheet-plasma" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "plasmatech=2;materials=2" + perunit = 2000 + sheettype = "plasma" + var/global/list/datum/stack_recipe/plasma_recipes = list ( \ new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/plasma - New(var/loc, var/amount=null) - recipes = plasma_recipes - return ..() +/obj/item/stack/sheet/mineral/plasma/New(var/loc, var/amount=null) + recipes = plasma_recipes + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() /* * Gold */ +/obj/item/stack/sheet/mineral/gold + name = "gold" + icon_state = "sheet-gold" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=4" + perunit = 2000 + sheettype = "gold" + var/global/list/datum/stack_recipe/gold_recipes = list ( \ new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/gold - New(var/loc, var/amount=null) - recipes = gold_recipes - return ..() +/obj/item/stack/sheet/mineral/gold/New(var/loc, var/amount=null) + recipes = gold_recipes + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() /* * Silver */ +/obj/item/stack/sheet/mineral/silver + name = "silver" + icon_state = "sheet-silver" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=3" + perunit = 2000 + sheettype = "silver" + var/global/list/datum/stack_recipe/silver_recipes = list ( \ new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/silver - New(var/loc, var/amount=null) - recipes = silver_recipes - return ..() \ No newline at end of file +/obj/item/stack/sheet/mineral/silver/New(var/loc, var/amount=null) + recipes = silver_recipes + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() + +/* + * Clown + */ +/obj/item/stack/sheet/mineral/clown + name = "bananium" + icon_state = "sheet-clown" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=4" + perunit = 2000 + sheettype = "clown" + +/obj/item/stack/sheet/mineral/clown/New(var/loc, var/amount=null) + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + ..() + + +/****************************** Others ****************************/ + +/* + * Enriched Uranium + */ +/obj/item/stack/sheet/mineral/enruranium + name = "enriched uranium" + icon_state = "sheet-enruranium" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=5" + perunit = 1000 + +/* + * Adamantine + */ +/obj/item/stack/sheet/mineral/adamantine + name = "adamantine" + icon_state = "sheet-adamantine" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=4" + perunit = 2000 + +/* + * Mythril + */ +/obj/item/stack/sheet/mineral/mythril + name = "mythril" + icon_state = "sheet-mythril" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=4" + perunit = 2000 \ No newline at end of file diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index fa1a37f603..6331c0341f 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -290,30 +290,13 @@ obj/structure/door_assembly if(!src || !WT.isOn()) return user << "\blue You dissasembled the airlock assembly!" new /obj/item/stack/sheet/metal(get_turf(src), 4) - switch(mineral) - if("glass") + if (mineral) + if (mineral == "glass") new /obj/item/stack/sheet/rglass(get_turf(src)) - if("gold") - new /obj/item/stack/sheet/gold(get_turf(src)) - new /obj/item/stack/sheet/gold(get_turf(src)) - if("silver") - new /obj/item/stack/sheet/silver(get_turf(src)) - new /obj/item/stack/sheet/silver(get_turf(src)) - if("diamond") - new /obj/item/stack/sheet/diamond(get_turf(src)) - new /obj/item/stack/sheet/diamond(get_turf(src)) - if("uranium") - new /obj/item/stack/sheet/uranium(get_turf(src)) - new /obj/item/stack/sheet/uranium(get_turf(src)) - if("plasma") - new /obj/item/stack/sheet/plasma(get_turf(src)) - new /obj/item/stack/sheet/plasma(get_turf(src)) - if("clown") - new /obj/item/stack/sheet/clown(get_turf(src)) - new /obj/item/stack/sheet/clown(get_turf(src)) - if("sandstone") - new /obj/item/stack/sheet/sandstone(get_turf(src)) - new /obj/item/stack/sheet/sandstone(get_turf(src)) + else + var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]") + new M(get_turf(src)) + new M(get_turf(src)) del(src) else user << "\blue You need more welding fuel to dissassemble the airlock assembly." @@ -396,95 +379,27 @@ obj/structure/door_assembly var/obj/item/stack/sheet/G = W if(G) if(G.amount>=1) - switch(G.type) - if(/obj/item/stack/sheet/rglass) + if(G.type == /obj/item/stack/sheet/rglass) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) + user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") + if(do_after(user, 40)) + user << "\blue You installed reinforced glass windows into the airlock assembly!" + G.use(1) + src.mineral = "glass" + src.name = "Near finished Window Airlock Assembly" + src.airlock_type = /obj/machinery/door/airlock/glass + src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end. + else if(istype(G, /obj/item/stack/sheet/mineral)) + if(G.amount>=2) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) - user << "\blue You installed reinforced glass windows into the airlock assembly!" - G.use(1) - src.mineral = "glass" - src.name = "Near finished Window Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/glass - src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end. - if(/obj/item/stack/sheet/gold) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed gold plating into the airlock assembly!" - G.use(2) - src.mineral = "gold" - src.name = "Near finished Gold Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/gold - src.base_icon_state = "door_as_gold" - if(/obj/item/stack/sheet/silver) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed silver plating into the airlock assembly!" - G.use(2) - src.mineral = "silver" - src.name = "Near finished Silver Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/silver - src.base_icon_state = "door_as_silver" - if(/obj/item/stack/sheet/diamond) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed diamond plating into the airlock assembly!" - G.use(2) - src.mineral = "diamond" - src.name = "Near finished Diamond Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/diamond - src.base_icon_state = "door_as_diamond" - if(/obj/item/stack/sheet/uranium) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed uranium plating into the airlock assembly!" - G.use(2) - src.mineral = "uranium" - src.name = "Near finished Uranium Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/uranium - src.base_icon_state = "door_as_uranium" - if(/obj/item/stack/sheet/plasma) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed plasma plating into the airlock assembly!" - G.use(2) - src.mineral = "plasma" - src.name = "Near finished Plasma Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/plasma - src.base_icon_state = "door_as_plasma" - if(/obj/item/stack/sheet/clown) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed bananium plating into the airlock assembly!HONK" - G.use(2) - playsound(src.loc, 'sound/items/bikehorn.ogg', 15, 1, -3) - src.mineral = "clown" - src.name = "Near finished Bananium Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/clown - src.base_icon_state = "door_as_clown" - if(/obj/item/stack/sheet/sandstone) - if(G.amount>=2) - playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") - if(do_after(user, 40)) - user << "\blue You installed sandstone plating into the airlock assembly!" - G.use(2) - src.mineral = "sandstone" - src.name = "Near finished Sandstone Airlock Assembly" - src.airlock_type = /obj/machinery/door/airlock/sandstone - src.base_icon_state = "door_as_sandstone" + user << "\blue You installed [G.sheettype] plating into the airlock assembly!" + G.use(2) + src.mineral = "[G.sheettype]" + src.name = "Near finished [G.sheettype] Airlock Assembly" + src.airlock_type = text2path ("/obj/machinery/door/airlock/[G.sheettype]") + src.base_icon_state = "door_as_[G.sheettype]" else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 ) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) @@ -494,33 +409,9 @@ obj/structure/door_assembly if(!src) return user << "\blue You finish the airlock!" var/obj/machinery/door/airlock/door - switch(mineral) - if("glass") - airlock_type = /obj/machinery/door/airlock/glass - door = new src.airlock_type( src.loc ) - if("gold") - airlock_type = /obj/machinery/door/airlock/gold - door = new src.airlock_type( src.loc ) - if("silver") - airlock_type = /obj/machinery/door/airlock/silver - door = new src.airlock_type( src.loc ) - if("diamond") - airlock_type = /obj/machinery/door/airlock/diamond - door = new src.airlock_type( src.loc ) - if("uranium") - airlock_type = /obj/machinery/door/airlock/uranium - door = new src.airlock_type( src.loc ) - if("plasma") - airlock_type = /obj/machinery/door/airlock/plasma - door = new src.airlock_type( src.loc ) - if("clown") - airlock_type = /obj/machinery/door/airlock/clown - door = new src.airlock_type( src.loc ) - if("sandstone") - airlock_type = /obj/machinery/door/airlock/sandstone - door = new src.airlock_type( src.loc ) - else - door = new src.airlock_type( src.loc ) + if (mineral) + airlock_type = text2path("/obj/machinery/door/airlock/[mineral]") + door = new src.airlock_type( src.loc ) //door.req_access = src.req_access door.electronics = src.electronics door.req_access = src.electronics.conf_access diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index c5799ca2dc..32a3b97707 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -35,11 +35,11 @@ if(!devastated) playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) new /obj/structure/girder(src) - var/M = text2path("/obj/item/stack/sheet/[mineral]") + var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]") new M( src ) new M( src ) else - var/M = text2path("/obj/item/stack/sheet/[mineral]") + var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]") new M( src ) new M( src ) new /obj/item/stack/sheet/metal( src ) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 0337b0e309..c85a1d9533 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -237,35 +237,35 @@ if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_gold > 0) ore_gold--; - new /obj/item/stack/sheet/gold(output.loc) + new /obj/item/stack/sheet/mineral/gold(output.loc) else on = 0 continue if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_silver > 0) ore_silver--; - new /obj/item/stack/sheet/silver(output.loc) + new /obj/item/stack/sheet/mineral/silver(output.loc) else on = 0 continue if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_diamond > 0) ore_diamond--; - new /obj/item/stack/sheet/diamond(output.loc) + new /obj/item/stack/sheet/mineral/diamond(output.loc) else on = 0 continue if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_plasma > 0) ore_plasma--; - new /obj/item/stack/sheet/plasma(output.loc) + new /obj/item/stack/sheet/mineral/plasma(output.loc) else on = 0 continue if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0) if (ore_uranium > 0) ore_uranium--; - new /obj/item/stack/sheet/uranium(output.loc) + new /obj/item/stack/sheet/mineral/uranium(output.loc) else on = 0 continue @@ -287,7 +287,7 @@ if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1) if (ore_clown > 0) ore_clown--; - new /obj/item/stack/sheet/clown(output.loc) + new /obj/item/stack/sheet/mineral/clown(output.loc) else on = 0 continue @@ -297,7 +297,7 @@ if (ore_uranium >= 2 && ore_diamond >= 1) ore_uranium -= 2 ore_diamond -= 1 - new /obj/item/stack/sheet/adamantine(output.loc) + new /obj/item/stack/sheet/mineral/adamantine(output.loc) else on = 0 continue @@ -305,7 +305,7 @@ if (ore_silver >= 1 && ore_plasma >= 3) ore_silver -= 1 ore_plasma -= 3 - new /obj/item/stack/sheet/mythril(output.loc) + new /obj/item/stack/sheet/mineral/mythril(output.loc) else on = 0 continue*/ diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 9a4a15956a..92aa8fbaea 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -70,13 +70,13 @@ switch(href_list["release"]) if ("plasma") if (machine.ore_plasma > 0) - var/obj/item/stack/sheet/plasma/G = new /obj/item/stack/sheet/plasma + var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma G.amount = machine.ore_plasma G.loc = machine.output.loc machine.ore_plasma = 0 if ("uranium") if (machine.ore_uranium > 0) - var/obj/item/stack/sheet/uranium/G = new /obj/item/stack/sheet/uranium + var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium G.amount = machine.ore_uranium G.loc = machine.output.loc machine.ore_uranium = 0 @@ -94,19 +94,19 @@ machine.ore_rglass = 0 if ("gold") if (machine.ore_gold > 0) - var/obj/item/stack/sheet/gold/G = new /obj/item/stack/sheet/gold + var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold G.amount = machine.ore_gold G.loc = machine.output.loc machine.ore_gold = 0 if ("silver") if (machine.ore_silver > 0) - var/obj/item/stack/sheet/silver/G = new /obj/item/stack/sheet/silver + var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver G.amount = machine.ore_silver G.loc = machine.output.loc machine.ore_silver = 0 if ("diamond") if (machine.ore_diamond > 0) - var/obj/item/stack/sheet/diamond/G = new /obj/item/stack/sheet/diamond + var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond G.amount = machine.ore_diamond G.loc = machine.output.loc machine.ore_diamond = 0 @@ -148,19 +148,19 @@ machine.ore_leather = 0 if ("clown") if (machine.ore_clown > 0) - var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown + var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown G.amount = machine.ore_clown G.loc = machine.output.loc machine.ore_clown = 0 if ("adamantine") if (machine.ore_adamantine > 0) - var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine + var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine G.amount = machine.ore_adamantine G.loc = machine.output.loc machine.ore_adamantine = 0 if ("mythril") if (machine.ore_mythril > 0) - var/obj/item/stack/sheet/mythril/G = new /obj/item/stack/sheet/mythril + var/obj/item/stack/sheet/mineral/mythril/G = new /obj/item/stack/sheet/mineral/mythril G.amount = machine.ore_mythril G.loc = machine.output.loc machine.ore_mythril = 0 @@ -222,27 +222,27 @@ ore_iron+= O:amount; del(O) continue - if (istype(O,/obj/item/stack/sheet/diamond)) + if (istype(O,/obj/item/stack/sheet/mineral/diamond)) ore_diamond+= O:amount; del(O) continue - if (istype(O,/obj/item/stack/sheet/plasma)) + if (istype(O,/obj/item/stack/sheet/mineral/plasma)) ore_plasma+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/gold)) + if (istype(O,/obj/item/stack/sheet/mineral/gold)) ore_gold+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/silver)) + if (istype(O,/obj/item/stack/sheet/mineral/silver)) ore_silver+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/clown)) + if (istype(O,/obj/item/stack/sheet/mineral/clown)) ore_clown+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/uranium)) + if (istype(O,/obj/item/stack/sheet/mineral/uranium)) ore_uranium+= O:amount del(O) continue @@ -258,11 +258,11 @@ ore_plasteel+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/adamantine)) + if (istype(O,/obj/item/stack/sheet/mineral/adamantine)) ore_adamantine+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/mythril)) + if (istype(O,/obj/item/stack/sheet/mineral/mythril)) ore_mythril+= O:amount del(O) continue @@ -287,25 +287,25 @@ continue O.loc = src.output.loc if (ore_gold >= stack_amt) - var/obj/item/stack/sheet/gold/G = new /obj/item/stack/sheet/gold + var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold G.amount = stack_amt G.loc = output.loc ore_gold -= stack_amt return if (ore_silver >= stack_amt) - var/obj/item/stack/sheet/silver/G = new /obj/item/stack/sheet/silver + var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver G.amount = stack_amt G.loc = output.loc ore_silver -= stack_amt return if (ore_diamond >= stack_amt) - var/obj/item/stack/sheet/diamond/G = new /obj/item/stack/sheet/diamond + var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond G.amount = stack_amt G.loc = output.loc ore_diamond -= stack_amt return if (ore_plasma >= stack_amt) - var/obj/item/stack/sheet/plasma/G = new /obj/item/stack/sheet/plasma + var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma G.amount = stack_amt G.loc = output.loc ore_plasma -= stack_amt @@ -317,13 +317,13 @@ ore_iron -= stack_amt return if (ore_clown >= stack_amt) - var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown + var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown G.amount = stack_amt G.loc = output.loc ore_clown -= stack_amt return if (ore_uranium >= stack_amt) - var/obj/item/stack/sheet/uranium/G = new /obj/item/stack/sheet/uranium + var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium G.amount = stack_amt G.loc = output.loc ore_uranium -= stack_amt @@ -371,13 +371,13 @@ ore_leather -= stack_amt return if (ore_adamantine >= stack_amt) - var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine + var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine G.amount = stack_amt G.loc = output.loc ore_adamantine -= stack_amt return if (ore_mythril >= stack_amt) - var/obj/item/stack/sheet/mythril/G = new /obj/item/stack/sheet/mythril + var/obj/item/stack/sheet/mineral/mythril/G = new /obj/item/stack/sheet/mineral/mythril G.amount = stack_amt G.loc = output.loc ore_mythril -= stack_amt diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index c7d6fbe880..ae5dd5ac0e 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -43,28 +43,28 @@ var/obj/item/stack/sheet/O O = locate(/obj/item/stack/sheet, input.loc) if(O) - if (istype(O,/obj/item/stack/sheet/gold)) + if (istype(O,/obj/item/stack/sheet/mineral/gold)) amt_gold += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/silver)) + if (istype(O,/obj/item/stack/sheet/mineral/silver)) amt_silver += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/diamond)) + if (istype(O,/obj/item/stack/sheet/mineral/diamond)) amt_diamond += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/plasma)) + if (istype(O,/obj/item/stack/sheet/mineral/plasma)) amt_plasma += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/uranium)) + if (istype(O,/obj/item/stack/sheet/mineral/uranium)) amt_uranium += 100 * O.amount del(O) if (istype(O,/obj/item/stack/sheet/metal)) amt_iron += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/clown)) + if (istype(O,/obj/item/stack/sheet/mineral/clown)) amt_clown += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/adamantine)) + if (istype(O,/obj/item/stack/sheet/mineral/adamantine)) amt_adamantine += 100 * O.amount del(O) //Commented out for now. -Durandan diff --git a/code/modules/mining/ores_materials_coins.dm b/code/modules/mining/ores_coins.dm similarity index 51% rename from code/modules/mining/ores_materials_coins.dm rename to code/modules/mining/ores_coins.dm index 82c427d37a..92114f629f 100644 --- a/code/modules/mining/ores_materials_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -24,9 +24,9 @@ attack_self(mob/living/user as mob) //It's magic I ain't gonna explain how instant conversion with no tool works. -- Urist var/location = get_turf(user) for(var/obj/item/weapon/ore/glass/sandToConvert in location) - new /obj/item/stack/sheet/sandstone(location) + new /obj/item/stack/sheet/mineral/sandstone(location) del(sandToConvert) - new /obj/item/stack/sheet/sandstone(location) + new /obj/item/stack/sheet/mineral/sandstone(location) del(src) /obj/item/weapon/ore/plasma @@ -143,136 +143,4 @@ overlays = list() string_attached = null user << "\blue You detach the string from the coin." - else ..() - -/******************************Materials****************************/ - -/obj/item/stack/sheet/gold - name = "gold" - icon_state = "sheet-gold" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=4" - perunit = 2000 - sheettype = "gold" - -/obj/item/stack/sheet/gold/New(loc,amount) - ..() - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 -/* recipes = gold_recipes //Commenting out until there's a proper sprite. The golden plaque is supposed to be a special item dedicated to a really good player. -Agouri - - var/global/list/datum/stack_recipe/gold_recipes = list ( \ - new/datum/stack_recipe("Plaque", /obj/item/weapon/plaque_assembly, 2), \ - )*/ - - -/obj/item/stack/sheet/silver - name = "silver" - icon_state = "sheet-silver" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=3" - perunit = 2000 - sheettype = "silver" - -/obj/item/stack/sheet/silver/New(loc,amount) - ..() - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 - -/obj/item/stack/sheet/diamond - name = "diamond" - icon_state = "sheet-diamond" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_range = 3 - origin_tech = "materials=6" - perunit = 3750 - sheettype = "diamond" - -/obj/item/stack/sheet/diamond/New(loc,amount) - ..() - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 - -/obj/item/stack/sheet/uranium - name = "uranium" - icon_state = "sheet-uranium" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=5" - perunit = 2000 - sheettype = "uranium" - -/obj/item/stack/sheet/enruranium - name = "enriched uranium" - icon_state = "sheet-enruranium" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=5" - perunit = 1000 - -/obj/item/stack/sheet/plasma - name = "solid plasma" - icon_state = "sheet-plasma" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "plasmatech=2;materials=2" - perunit = 2000 - sheettype = "plasma" - -/obj/item/stack/sheet/adamantine - name = "adamantine" - icon_state = "sheet-adamantine" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=4" - perunit = 2000 - -/obj/item/stack/sheet/mythril - name = "mythril" - icon_state = "sheet-mythril" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=4" - perunit = 2000 - -/obj/item/stack/sheet/clown - name = "bananium" - icon_state = "sheet-clown" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=4" - perunit = 2000 - sheettype = "clown" - -/obj/item/stack/sheet/clown/New(loc,amount) - ..() - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 \ No newline at end of file + else ..() \ No newline at end of file diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 259b5fb587..1487582395 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -119,37 +119,37 @@ S.amount = stacksize glass -= stacksize while(gold) - var/obj/item/stack/sheet/gold/S = new (location) + var/obj/item/stack/sheet/mineral/gold/S = new (location) var/stacksize = min(gold,50) S.amount = stacksize gold -= stacksize while(silver) - var/obj/item/stack/sheet/silver/S = new (location) + var/obj/item/stack/sheet/mineral/silver/S = new (location) var/stacksize = min(silver,50) S.amount = stacksize silver -= stacksize while(diamond) - var/obj/item/stack/sheet/diamond/S = new (location) + var/obj/item/stack/sheet/mineral/diamond/S = new (location) var/stacksize = min(diamond,50) S.amount = stacksize diamond -= stacksize while(plasma) - var/obj/item/stack/sheet/plasma/S = new (location) + var/obj/item/stack/sheet/mineral/plasma/S = new (location) var/stacksize = min(plasma,50) S.amount = stacksize plasma -= stacksize while(uranium) - var/obj/item/stack/sheet/uranium/S = new (location) + var/obj/item/stack/sheet/mineral/uranium/S = new (location) var/stacksize = min(uranium,50) S.amount = stacksize uranium -= stacksize while(clown) - var/obj/item/stack/sheet/clown/S = new (location) + var/obj/item/stack/sheet/mineral/clown/S = new (location) var/stacksize = min(clown,50) S.amount = stacksize clown -= stacksize while(euranium) - var/obj/item/stack/sheet/enruranium/S = new (location) + var/obj/item/stack/sheet/mineral/enruranium/S = new (location) var/stacksize = min(euranium,50) S.amount = stacksize euranium -= stacksize diff --git a/code/modules/mob/living/simple_animal/worm.dm b/code/modules/mob/living/simple_animal/worm.dm index ef64146a64..369caf1789 100644 --- a/code/modules/mob/living/simple_animal/worm.dm +++ b/code/modules/mob/living/simple_animal/worm.dm @@ -174,18 +174,18 @@ for(var/atom/movable/stomachContent in contents) if(prob(digestionProbability)) if(istype(stomachContent,/obj/item/stack)) //converts to plasma, keeping the stack value - if(!istype(stomachContent,/obj/item/stack/sheet/plasma)) + if(!istype(stomachContent,/obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/oldStack = stomachContent - new /obj/item/stack/sheet/plasma(src, oldStack.amount) + new /obj/item/stack/sheet/mineral/plasma(src, oldStack.amount) del(oldStack) continue else if(istype(stomachContent,/obj/item)) //converts to plasma, keeping the w_class var/obj/item/oldItem = stomachContent - new /obj/item/stack/sheet/plasma(src, oldItem.w_class) + new /obj/item/stack/sheet/mineral/plasma(src, oldItem.w_class) del(oldItem) continue else - new /obj/item/stack/sheet/plasma(src, flatPlasmaValue) //just flat amount + new /obj/item/stack/sheet/mineral/plasma(src, flatPlasmaValue) //just flat amount del(stomachContent) continue diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index bebbd23912..7ef8626512 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -100,7 +100,7 @@ display round(lastgen) and plasmatank amount name = "P.A.C.M.A.N.-type Portable Generator" var/sheets = 0 var/max_sheets = 100 - var/sheet_path = /obj/item/stack/sheet/plasma + var/sheet_path = /obj/item/stack/sheet/mineral/plasma var/board_path = "/obj/item/weapon/circuitboard/pacman" var/sheet_left = 0 // How much is left of the sheet var/time_per_sheet = 10 @@ -289,7 +289,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/super name = "S.U.P.E.R.P.A.C.M.A.N.-type Portable Generator" icon_state = "portgen1" - sheet_path = /obj/item/stack/sheet/uranium + sheet_path = /obj/item/stack/sheet/mineral/uranium power_gen = 15000 time_per_sheet = 25 board_path = "/obj/item/weapon/circuitboard/pacman/super" @@ -299,7 +299,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/mrs name = "M.R.S.P.A.C.M.A.N.-type Portable Generator" icon_state = "portgen2" - sheet_path = /obj/item/stack/sheet/diamond + sheet_path = /obj/item/stack/sheet/mineral/diamond power_gen = 40000 time_per_sheet = 30 board_path = "/obj/item/weapon/circuitboard/pacman/mrs" diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e1aee9117b..a7d1b98489 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -745,11 +745,11 @@ var/list/blend_items = list ( //Sheets - /obj/item/stack/sheet/plasma = list("plasma" = 20), - /obj/item/stack/sheet/uranium = list("uranium" = 20), - /obj/item/stack/sheet/clown = list("banana" = 20), - /obj/item/stack/sheet/silver = list("silver" = 20), - /obj/item/stack/sheet/gold = list("gold" = 20), + /obj/item/stack/sheet/mineral/plasma = list("plasma" = 20), + /obj/item/stack/sheet/mineral/uranium = list("uranium" = 20), + /obj/item/stack/sheet/mineral/clown = list("banana" = 20), + /obj/item/stack/sheet/mineral/silver = list("silver" = 20), + /obj/item/stack/sheet/mineral/gold = list("gold" = 20), /obj/item/weapon/grown/nettle = list("sacid" = 0), /obj/item/weapon/grown/deathnettle = list("pacid" = 0), diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f97dea684e..30c99a2f48 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -445,7 +445,7 @@ datum result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/stack/sheet/plasma(location) + new /obj/item/stack/sheet/mineral/plasma(location) return virus_food diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 6280ae54e7..f617533516 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -80,10 +80,10 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc) G.amount = round(g_amount / 3750) if(gold_amount >= 2000) - var/obj/item/stack/sheet/gold/G = new /obj/item/stack/sheet/gold(src.loc) + var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc) G.amount = round(gold_amount / 2000) if(diamond_amount >= 2000) - var/obj/item/stack/sheet/diamond/G = new /obj/item/stack/sheet/diamond(src.loc) + var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc) G.amount = round(diamond_amount / 2000) del(src) return 1 @@ -97,7 +97,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). return 1 if (O.is_open_container()) return 1 - if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/gold) && !istype(O, /obj/item/stack/sheet/diamond)) + if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond)) user << "\red You cannot insert this item into the [name]!" return 1 if (stat) @@ -124,9 +124,9 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). user << "\blue You add [amount] sheets to the [src.name]." if(istype(stack, /obj/item/stack/sheet/glass)) g_amount += amount * 3750 - else if(istype(stack, /obj/item/stack/sheet/gold)) + else if(istype(stack, /obj/item/stack/sheet/mineral/gold)) gold_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/diamond)) + else if(istype(stack, /obj/item/stack/sheet/mineral/diamond)) diamond_amount += amount * 2000 stack.use(amount) busy = 0 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 89871bbccd..d16d622438 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -88,25 +88,25 @@ Note: Must be placed west/left of and R&D console to function. var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc) G.amount = round(g_amount / G.perunit) if(plasma_amount >= 2000) - var/obj/item/stack/sheet/plasma/G = new /obj/item/stack/sheet/plasma(src.loc) + var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc) G.amount = round(plasma_amount / G.perunit) if(silver_amount >= 2000) - var/obj/item/stack/sheet/silver/G = new /obj/item/stack/sheet/silver(src.loc) + var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(src.loc) G.amount = round(silver_amount / G.perunit) if(gold_amount >= 2000) - var/obj/item/stack/sheet/gold/G = new /obj/item/stack/sheet/gold(src.loc) + var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc) G.amount = round(gold_amount / G.perunit) if(uranium_amount >= 2000) - var/obj/item/stack/sheet/uranium/G = new /obj/item/stack/sheet/uranium(src.loc) + var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(src.loc) G.amount = round(uranium_amount / G.perunit) if(diamond_amount >= 2000) - var/obj/item/stack/sheet/diamond/G = new /obj/item/stack/sheet/diamond(src.loc) + var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc) G.amount = round(diamond_amount / G.perunit) if(clown_amount >= 2000) - var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown(src.loc) + var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc) G.amount = round(clown_amount / G.perunit) if(adamantine_amount >= 2000) - var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine(src.loc) + var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine(src.loc) G.amount = round(adamantine_amount / G.perunit) del(src) return 1 @@ -157,19 +157,19 @@ Note: Must be placed west/left of and R&D console to function. m_amount += amount * 3750 else if(istype(stack, /obj/item/stack/sheet/glass)) g_amount += amount * 3750 - else if(istype(stack, /obj/item/stack/sheet/gold)) + else if(istype(stack, /obj/item/stack/sheet/mineral/gold)) gold_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/silver)) + else if(istype(stack, /obj/item/stack/sheet/mineral/silver)) silver_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/plasma)) + else if(istype(stack, /obj/item/stack/sheet/mineral/plasma)) plasma_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/uranium)) + else if(istype(stack, /obj/item/stack/sheet/mineral/uranium)) uranium_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/diamond)) + else if(istype(stack, /obj/item/stack/sheet/mineral/diamond)) diamond_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/clown)) + else if(istype(stack, /obj/item/stack/sheet/mineral/clown)) clown_amount += amount * 2000 - else if(istype(stack, /obj/item/stack/sheet/adamantine)) + else if(istype(stack, /obj/item/stack/sheet/mineral/adamantine)) adamantine_amount += amount * 2000 stack.use(amount) busy = 0 diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 9cc25c8281..a94d9c6f71 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -460,22 +460,22 @@ won't update every console in existence) but it's more of a hassle to do. Also, type = /obj/item/stack/sheet/glass res_amount = "g_amount" if("gold") - type = /obj/item/stack/sheet/gold + type = /obj/item/stack/sheet/mineral/gold res_amount = "gold_amount" if("silver") - type = /obj/item/stack/sheet/silver + type = /obj/item/stack/sheet/mineral/silver res_amount = "silver_amount" if("plasma") - type = /obj/item/stack/sheet/plasma + type = /obj/item/stack/sheet/mineral/plasma res_amount = "plasma_amount" if("uranium") - type = /obj/item/stack/sheet/uranium + type = /obj/item/stack/sheet/mineral/uranium res_amount = "uranium_amount" if("diamond") - type = /obj/item/stack/sheet/diamond + type = /obj/item/stack/sheet/mineral/diamond res_amount = "diamond_amount" if("clown") - type = /obj/item/stack/sheet/clown + type = /obj/item/stack/sheet/mineral/clown res_amount = "clown_amount" if(ispath(type) && hasvar(linked_lathe, res_amount)) var/obj/item/stack/sheet/sheet = new type(linked_lathe.loc) @@ -493,10 +493,10 @@ won't update every console in existence) but it's more of a hassle to do. Also, type = /obj/item/stack/sheet/glass res_amount = "g_amount" if("gold") - type = /obj/item/stack/sheet/gold + type = /obj/item/stack/sheet/mineral/gold res_amount = "gold_amount" if("diamond") - type = /obj/item/stack/sheet/diamond + type = /obj/item/stack/sheet/mineral/diamond res_amount = "diamond_amount" if(ispath(type) && hasvar(linked_imprinter, res_amount)) var/obj/item/stack/sheet/sheet = new type(linked_imprinter.loc) diff --git a/code/unused/mining/datum_processing_recipe.dm b/code/unused/mining/datum_processing_recipe.dm index 4197db1c2f..0a1f5e1eda 100644 --- a/code/unused/mining/datum_processing_recipe.dm +++ b/code/unused/mining/datum_processing_recipe.dm @@ -15,9 +15,9 @@ var/list/AVAILABLE_ORES = typesof(/obj/item/weapon/ore) var/list/datum/material_recipe/MATERIAL_RECIPES = list( new/datum/material_recipe("Metal",list(/obj/item/weapon/ore/iron),/obj/item/stack/sheet/metal), new/datum/material_recipe("Glass",list(/obj/item/weapon/ore/glass),/obj/item/stack/sheet/glass), - new/datum/material_recipe("Gold",list(/obj/item/weapon/ore/gold),/obj/item/stack/sheet/gold), - new/datum/material_recipe("Silver",list(/obj/item/weapon/ore/silver),/obj/item/stack/sheet/silver), - new/datum/material_recipe("Diamond",list(/obj/item/weapon/ore/diamond),/obj/item/stack/sheet/diamond), - new/datum/material_recipe("Plasma",list(/obj/item/weapon/ore/plasma),/obj/item/stack/sheet/plasma), - new/datum/material_recipe("Bananium",list(/obj/item/weapon/ore/clown),/obj/item/stack/sheet/clown), + new/datum/material_recipe("Gold",list(/obj/item/weapon/ore/gold),/obj/item/stack/sheet/mineral/gold), + new/datum/material_recipe("Silver",list(/obj/item/weapon/ore/silver),/obj/item/stack/sheet/mineral/silver), + new/datum/material_recipe("Diamond",list(/obj/item/weapon/ore/diamond),/obj/item/stack/sheet/mineral/diamond), + new/datum/material_recipe("Plasma",list(/obj/item/weapon/ore/plasma),/obj/item/stack/sheet/mineral/plasma), + new/datum/material_recipe("Bananium",list(/obj/item/weapon/ore/clown),/obj/item/stack/sheet/mineral/clown), ) \ No newline at end of file diff --git a/code/unused/mining/machine_craftlathe_unused.dm b/code/unused/mining/machine_craftlathe_unused.dm index bc486be37e..dc4ca5b3af 100644 --- a/code/unused/mining/machine_craftlathe_unused.dm +++ b/code/unused/mining/machine_craftlathe_unused.dm @@ -171,13 +171,13 @@ proc/check_craftlathe_recipe(var/list/param_recipe) CRAFT_ITEMS += new/datum/craftlathe_item("R METAL","Reinforced Metal",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/r_metal) CRAFT_ITEMS += new/datum/craftlathe_item("GLASS","Glass",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/glass) CRAFT_ITEMS += new/datum/craftlathe_item("R GLASS","Reinforced Glass",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/rglass) - CRAFT_ITEMS += new/datum/craftlathe_item("GOLD","Gold",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/gold) - CRAFT_ITEMS += new/datum/craftlathe_item("SILVER","Silver",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/silver) - CRAFT_ITEMS += new/datum/craftlathe_item("DIAMOND","Diamond",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/diamond) - CRAFT_ITEMS += new/datum/craftlathe_item("PLASMA","Plasma",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/plasma) - CRAFT_ITEMS += new/datum/craftlathe_item("URANIUM","Uranium",1,1,list("","","","","","","","",""),/obj/item/weapon/ore/uranium) - CRAFT_ITEMS += new/datum/craftlathe_item("CLOWN","Bananium",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/clown) - CRAFT_ITEMS += new/datum/craftlathe_item("ADMAMANTINE","Adamantine",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/adamantine) + CRAFT_ITEMS += new/datum/craftlathe_item("GOLD","Gold",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/mineral/gold) + CRAFT_ITEMS += new/datum/craftlathe_item("SILVER","Silver",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/mineral/silver) + CRAFT_ITEMS += new/datum/craftlathe_item("DIAMOND","Diamond",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/mineral/diamond) + CRAFT_ITEMS += new/datum/craftlathe_item("PLASMA","Plasma",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/mineral/plasma) + CRAFT_ITEMS += new/datum/craftlathe_item("URANIUM","Uranium",1,1,list("","","","","","","","",""),/obj/item/weapon/ore/mineral/uranium) + CRAFT_ITEMS += new/datum/craftlathe_item("CLOWN","Bananium",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/mineral/clown) + CRAFT_ITEMS += new/datum/craftlathe_item("ADMAMANTINE","Adamantine",1,1,list("","","","","","","","",""),/obj/item/stack/sheet/mineral/adamantine) CRAFT_ITEMS += new/datum/craftlathe_item("SCREWS","Screws",9,9,list("","","","","METAL","","","METAL","")) CRAFT_ITEMS += new/datum/craftlathe_item("COGS","Cogs",9,9,list("","METAL","","METAL","METAL","METAL","","METAL","")) CRAFT_ITEMS += new/datum/craftlathe_item("SWITCH","Switch",12,12,list("METAL","","METAL","METAL","METAL","","METAL","","")) diff --git a/code/unused/mining/machine_purifier_unused.dm b/code/unused/mining/machine_purifier_unused.dm index 26fc41e517..1dd47a4fc3 100644 --- a/code/unused/mining/machine_purifier_unused.dm +++ b/code/unused/mining/machine_purifier_unused.dm @@ -51,19 +51,19 @@ new /obj/item/stack/sheet/metal(output.loc) del(O) if (istype(O,/obj/item/weapon/ore/diamond)) - new /obj/item/stack/sheet/diamond(output.loc) + new /obj/item/stack/sheet/mineral/diamond(output.loc) del(O) if (istype(O,/obj/item/weapon/ore/plasma)) - new /obj/item/stack/sheet/plasma(output.loc) + new /obj/item/stack/sheet/mineral/plasma(output.loc) del(O) if (istype(O,/obj/item/weapon/ore/gold)) - new /obj/item/stack/sheet/gold(output.loc) + new /obj/item/stack/sheet/mineral/gold(output.loc) del(O) if (istype(O,/obj/item/weapon/ore/silver)) - new /obj/item/stack/sheet/silver(output.loc) + new /obj/item/stack/sheet/mineral/silver(output.loc) del(O) if (istype(O,/obj/item/weapon/ore/uranium)) - new /obj/item/weapon/ore/uranium(output.loc) + new /obj/item/weapon/ore/mineral/uranium(output.loc) del(O) /*if (istype(O,/obj/item/weapon/ore/adamantine)) new /obj/item/weapon/ore/adamantine(output.loc) diff --git a/code/unused/powerarmor/powerarmor.dm b/code/unused/powerarmor/powerarmor.dm index 9df4e5242b..0c6b3b8993 100644 --- a/code/unused/powerarmor/powerarmor.dm +++ b/code/unused/powerarmor/powerarmor.dm @@ -168,7 +168,7 @@ attackby(obj/item/weapon/W as obj, mob/user as mob) if(power && istype(power,/obj/item/powerarmor/power/plasma)) switch(W.type) - if(/obj/item/stack/sheet/plasma) + if(/obj/item/stack/sheet/mineral/plasma) if(fuel < 50) user << "\blue You feed some refined plasma into the armor's generator." power:fuel += 25 diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 6d6e93fc7f..b2c6115d1a 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -3227,7 +3227,7 @@ "bkc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Chemistry Lab"; req_access_txt = "5; 33"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bkd" = (/obj/machinery/power/apc{dir = 8; level = 4; name = "Chemistry APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bke" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"bkf" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/stack/sheet/plasma{layer = 2.9},/obj/item/stack/sheet/plasma{layer = 2.9},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) +"bkf" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bkg" = (/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bkh" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bki" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) @@ -4236,7 +4236,7 @@ "bDx" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor,/area/quartermaster/miningdock) "bDy" = (/obj/machinery/light,/turf/simulated/floor,/area/quartermaster/miningdock) "bDz" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable,/turf/simulated/floor/plating,/area/security/nuke_storage) -"bDA" = (/obj/machinery/camera{c_tag = "Vault"; dir = 4; network = "SS13"},/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/stack/sheet/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/gold{pixel_y = 2},/obj/item/stack/sheet/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/storage/belt/champion,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage) +"bDA" = (/obj/machinery/camera{c_tag = "Vault"; dir = 4; network = "SS13"},/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/stack/sheet/mineral/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/mineral/gold{pixel_y = 2},/obj/item/stack/sheet/mineral/gold{pixel_x = 1; pixel_y = -2},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/storage/belt/champion,/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/nuke_storage) "bDB" = (/obj/machinery/nuclearbomb{r_code = "LOLNO"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/security/nuke_storage) "bDC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/weapon/coin/silver{pixel_x = 12; pixel_y = 7},/obj/item/weapon/coin/silver{pixel_x = 4; pixel_y = 8},/obj/item/weapon/coin/silver{pixel_x = -6; pixel_y = 5},/obj/item/weapon/coin/silver{pixel_x = 5; pixel_y = -8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/closet/crate{name = "Silver Crate"},/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/security/nuke_storage) "bDD" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/hallway/primary/aft) diff --git a/tgstation.dme b/tgstation.dme index 830e0b3e12..76488b15e6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -211,6 +211,7 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" +#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" @@ -956,7 +957,7 @@ #include "code\modules\mining\mine_turfs.dm" #include "code\modules\mining\mint.dm" #include "code\modules\mining\money_bag.dm" -#include "code\modules\mining\ores_materials_coins.dm" +#include "code\modules\mining\ores_coins.dm" #include "code\modules\mining\satchel_ore_boxdm.dm" #include "code\modules\mob\death.dm" #include "code\modules\mob\inventory.dm"