diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 41628f279e..e8a9dc072f 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -120,7 +120,7 @@ projectile = /obj/item/projectile/beam/stun fire_sound = 'sound/weapons/Taser.ogg' - +/* Commenting this out rather than removing it because it may be useful for reference. /obj/item/mecha_parts/mecha_equipment/weapon/honker name = "HoNkER BlAsT 5000" icon_state = "mecha_honker" @@ -175,6 +175,7 @@ log_message("Honked from [src.name]. HONK!") do_after_cooldown() return +*/ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "General Ballisic Weapon" @@ -286,32 +287,4 @@ return "* [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]\[[src.projectiles]\]" /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/rearm() - return//Extra bit of security - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar - name = "Banana Mortar" - icon_state = "mecha_bananamrtr" - projectile = /obj/item/weapon/bananapeel - fire_sound = 'sound/items/bikehorn.ogg' - projectiles = 15 - missile_speed = 1.5 - projectile_energy_cost = 100 - equip_cooldown = 20 - construction_time = 300 - construction_cost = list("metal"=20000,"bananium"=5000) - - can_attach(obj/mecha/combat/honker/M as obj) - if(!istype(M)) - return 0 - return ..() - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/mousetrap_mortar - name = "Mousetrap Mortar" - icon_state = "mecha_mousetrapmrtr" - projectile = /obj/item/device/assembly/mousetrap - equip_cooldown = 10 - -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/mousetrap_mortar/Fire(atom/movable/AM, atom/target, turf/aimloc) - var/obj/item/device/assembly/mousetrap/M = AM - M.secured = 1 - ..() \ No newline at end of file + return//Extra bit of security \ No newline at end of file diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index bfdf3e32c2..8507e0f237 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -23,7 +23,6 @@ "diamond"=0, "phoron"=0, "uranium"=0, - //"bananium"=0 No need to state what it can no longer hold ) var/res_max_amount = 200000 var/datum/research/files @@ -362,11 +361,11 @@ /obj/machinery/mecha_part_fabricator/proc/build_part(var/obj/item/part) if(!part) return - + // critical exploit prevention, do not remove unless you replace it -walter0o if( !(locate(part, src.contents)) || !(part.vars.Find("construction_time")) || !(part.vars.Find("construction_cost")) ) // these 3 are the current requirements for an object being buildable by the mech_fabricator return - + src.being_built = new part.type(src) src.desc = "It's building [src.being_built]." src.remove_resources(part) @@ -503,7 +502,7 @@ src.updateUsrDialog() return */ - if(!silent) + if(!silent) temp = "Updating local R&D database..." src.updateUsrDialog() sleep(30) //only sleep if called by user @@ -610,24 +609,24 @@ /obj/machinery/mecha_part_fabricator/proc/exploit_prevention(var/obj/Part, mob/user as mob, var/desc_exploit) // critical exploit prevention, feel free to improve or replace this, but do not remove it -walter0o - + if(!Part || !user || !istype(Part) || !istype(user)) // sanity return 1 - + if( !(locate(Part, src.contents)) || !(Part.vars.Find("construction_time")) || !(Part.vars.Find("construction_cost")) ) // these 3 are the current requirements for an object being buildable by the mech_fabricator - + var/turf/LOC = get_turf(user) message_admins("[key_name_admin(user)] tried to exploit an Exosuit Fabricator to [desc_exploit ? "get the desc of" : "duplicate"] [Part] ! ([LOC ? "JMP" : "null"])", 0) - log_admin("EXPLOIT : [key_name(user)] tried to exploit an Exosuit Fabricator to [desc_exploit ? "get the desc of" : "duplicate"] [Part] !") + log_admin("EXPLOIT : [key_name(user)] tried to exploit an Exosuit Fabricator to [desc_exploit ? "get the desc of" : "duplicate"] [Part] !") return 1 - + return null /obj/machinery/mecha_part_fabricator/Topic(href, href_list) if(..()) // critical exploit prevention, do not remove unless you replace it -walter0o return - + var/datum/topic_input/filter = new /datum/topic_input(href,href_list) if(href_list["part_set"]) var/tpart_set = filter.getStr("part_set") @@ -639,24 +638,24 @@ screen = "parts" if(href_list["part"]) var/obj/part = filter.getObj("part") - + // critical exploit prevention, do not remove unless you replace it -walter0o if(src.exploit_prevention(part, usr)) return - + if(!processing_queue) build_part(part) else add_to_queue(part) if(href_list["add_to_queue"]) var/obj/part = filter.getObj("add_to_queue") - + // critical exploit prevention, do not remove unless you replace it -walter0o if(src.exploit_prevention(part, usr)) return - + add_to_queue(part) - + return update_queue_on_page() if(href_list["remove_from_queue"]) remove_from_queue(filter.getNum("remove_from_queue")) @@ -695,12 +694,12 @@ return update_queue_on_page() if(href_list["part_desc"]) var/obj/part = filter.getObj("part_desc") - + // critical exploit prevention, do not remove unless you replace it -walter0o if(src.exploit_prevention(part, usr, 1)) return - - if(part) + + if(part) temp = {"

[part] description:

[part.desc]
Return @@ -727,8 +726,6 @@ type = /obj/item/stack/sheet/mineral/phoron if("uranium") type = /obj/item/stack/sheet/mineral/uranium - /*if("bananium") - type = /obj/item/stack/sheet/mineral/clown Sorry, but no more clown mechs, even if you do manage to get to the clown planet.*/ else return 0 var/result = 0 @@ -786,9 +783,6 @@ if(src.resources["diamond"] >= 2000) 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/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc) - G.amount = round(src.resources["bananium"] / G.perunit) Sorry, but no bananium allowed*/ del(src) return 1 else @@ -812,8 +806,6 @@ material = "metal" if(/obj/item/stack/sheet/glass) material = "glass" - /*if(/obj/item/stack/sheet/mineral/clown) - material = "bananium"*/ if(/obj/item/stack/sheet/mineral/uranium) material = "uranium" else diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 5a8972ee4a..479c8f7d09 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -232,52 +232,6 @@ icon_state = "ripley_r_leg" */ -////////// HONK - -/obj/item/mecha_parts/chassis/honker - name = "H.O.N.K Chassis" - - New() - ..() - construct = new /datum/construction/mecha/honker_chassis(src) - -/obj/item/mecha_parts/part/honker_torso - name="H.O.N.K Torso" - icon_state = "honker_harness" - construction_time = 300 - construction_cost = list("metal"=35000,"glass"=10000,"bananium"=10000) - -/obj/item/mecha_parts/part/honker_head - name="H.O.N.K Head" - icon_state = "honker_head" - construction_time = 200 - construction_cost = list("metal"=15000,"glass"=5000,"bananium"=5000) - -/obj/item/mecha_parts/part/honker_left_arm - name="H.O.N.K Left Arm" - icon_state = "honker_l_arm" - construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) - -/obj/item/mecha_parts/part/honker_right_arm - name="H.O.N.K Right Arm" - icon_state = "honker_r_arm" - construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) - -/obj/item/mecha_parts/part/honker_left_leg - name="H.O.N.K Left Leg" - icon_state = "honker_l_leg" - construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) - -/obj/item/mecha_parts/part/honker_right_leg - name="H.O.N.K Right Leg" - icon_state = "honker_r_leg" - construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) - - ////////// Phazon /obj/item/mecha_parts/chassis/phazon diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 737273e8ea..64722065b3 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -14,127 +14,31 @@ Mineral Sheets - Enriched Uranium */ -/* - * Sandstone - */ -/obj/item/stack/sheet/mineral/sandstone - name = "sandstone brick" - desc = "This appears to be a combination of both sand and stone." - singular_name = "sandstone brick" - icon_state = "sheet-sandstone" - throw_speed = 4 - throw_range = 5 - origin_tech = "materials=1" - sheettype = "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/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/silver_recipes = list ( \ + new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \ + ) 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/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/mineral/uranium/New(var/loc, var/amount=null) - recipes = uranium_recipes - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 - ..() - -/* - * Phoron - */ -/obj/item/stack/sheet/mineral/phoron - name = "solid phoron" - icon_state = "sheet-phoron" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "phorontech=2;materials=2" - perunit = 2000 - sheettype = "phoron" +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), \ + ) var/global/list/datum/stack_recipe/phoron_recipes = list ( \ new/datum/stack_recipe("phoron door", /obj/structure/mineral_door/transparent/phoron, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/phoron/New(var/loc, var/amount=null) - recipes = phoron_recipes - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 - ..() - -/obj/item/stack/sheet/mineral/plastic - name = "Plastic" - icon_state = "sheet-plastic" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - origin_tech = "materials=3" - perunit = 2000 - -/obj/item/stack/sheet/mineral/plastic/cyborg - name = "plastic sheets" - icon_state = "sheet-plastic" - force = 5.0 - throwforce = 5 - w_class = 3.0 - throw_speed = 3 - throw_range = 3 - perunit = 2000 - var/global/list/datum/stack_recipe/plastic_recipes = list ( \ new/datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1), \ @@ -144,151 +48,150 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \ new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/plastic/New(var/loc, var/amount=null) - recipes = plastic_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" +/obj/item/stack/sheet/mineral force = 5.0 throwforce = 5 w_class = 3.0 throw_speed = 3 throw_range = 3 + +/obj/item/stack/sheet/mineral/New() + ..() + pixel_x = rand(0,4)-4 + pixel_y = rand(0,4)-4 + +/obj/item/stack/sheet/mineral/sandstone + name = "sandstone brick" + desc = "This appears to be a combination of both sand and stone." + singular_name = "sandstone brick" + icon_state = "sheet-sandstone" + throw_speed = 4 + throw_range = 5 + origin_tech = "materials=1" + sheettype = "sandstone" + +/obj/item/stack/sheet/mineral/sandstone/New() + ..() + recipes = sandstone_recipes + +/obj/item/stack/sheet/mineral/diamond + name = "diamond" + icon_state = "sheet-diamond" + origin_tech = "materials=6" + perunit = 3750 + sheettype = "diamond" + + +/obj/item/stack/sheet/mineral/diamond/New() + ..() + recipes = diamond_recipes + +/obj/item/stack/sheet/mineral/uranium + name = "uranium" + icon_state = "sheet-uranium" + origin_tech = "materials=5" + perunit = 2000 + sheettype = "uranium" + +/obj/item/stack/sheet/mineral/uranium/New() + ..() + recipes = uranium_recipes + +/obj/item/stack/sheet/mineral/phoron + name = "solid phoron" + icon_state = "sheet-phoron" + origin_tech = "phorontech=2;materials=2" + perunit = 2000 + sheettype = "phoron" + +/obj/item/stack/sheet/mineral/phoron/New() + ..() + recipes = phoron_recipes + +/obj/item/stack/sheet/mineral/plastic + name = "Plastic" + icon_state = "sheet-plastic" + origin_tech = "materials=3" + perunit = 2000 + +/obj/item/stack/sheet/mineral/plastic/New() + ..() + recipes = plastic_recipes + +/obj/item/stack/sheet/mineral/plastic/cyborg + name = "plastic sheets" + icon_state = "sheet-plastic" + perunit = 2000 + +/obj/item/stack/sheet/mineral/gold + name = "gold" + icon_state = "sheet-gold" 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/mineral/gold/New(var/loc, var/amount=null) - recipes = gold_recipes - pixel_x = rand(0,4)-4 - pixel_y = rand(0,4)-4 +/obj/item/stack/sheet/mineral/gold/New() ..() + recipes = gold_recipes -/* - * 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/mineral/silver/New(var/loc, var/amount=null) +/obj/item/stack/sheet/mineral/silver/New() + ..() 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 -/* - * TODO - */ /obj/item/stack/sheet/mineral/platinum name = "platinum" - icon_state = "sheet-diamond" //TODO + icon_state = "sheet-adamantine" sheettype = "platinum" + perunit = 2000 /obj/item/stack/sheet/mineral/mhydrogen name = "metallic hydrogen" - icon_state = "sheet-diamond" //TODO + icon_state = "sheet-mythril" sheettype = "mhydrogen" + perunit = 2000 /obj/item/stack/sheet/mineral/tritium name = "tritium" - icon_state = "sheet-diamond" //TODO + icon_state = "sheet-silver" sheettype = "tritium" + color = "#777777" + perunit = 2000 /obj/item/stack/sheet/mineral/osmium name = "osmium" - icon_state = "sheet-diamond" //TODO + icon_state = "sheet-silver" sheettype = "osmium" + color = "#9999FF" + perunit = 2000 obj/item/stack/sheet/mineral/iron name = "iron" - icon_state = "sheet-gold" + icon_state = "sheet-silver" sheettype = "iron" + color = "#333333" + perunit = 3750 diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 6c92f3c2df..a1a3876574 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -124,7 +124,6 @@ /obj/item/stack/sheet/mineral/phoron, /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/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 0d496b47cd..014ecae9ac 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -326,13 +326,6 @@ icon_state = "" mineral = "phoron" -//-----------wtf?-----------start -/obj/structure/falsewall/clown - name = "bananium wall" - desc = "A wall with bananium plating. Honk!" - icon_state = "" - mineral = "clown" - /obj/structure/falsewall/sandstone name = "sandstone wall" desc = "A wall with sandstone plating." diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 2d08a1dd65..b600b11dcd 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -30,13 +30,6 @@ walltype = "diamond" mineral = "diamond" -/turf/simulated/wall/mineral/clown - name = "bananium wall" - desc = "A wall with bananium plating. Honk!" - icon_state = "clown0" - walltype = "clown" - mineral = "clown" - /turf/simulated/wall/mineral/sandstone name = "sandstone wall" desc = "A wall with sandstone plating." diff --git a/code/modules/mining/minerals.dm b/code/modules/mining/minerals.dm index 30db226207..a5ba349d08 100644 --- a/code/modules/mining/minerals.dm +++ b/code/modules/mining/minerals.dm @@ -62,11 +62,4 @@ mineral/phoron name = "Phoron" result_amount = 5 spread_chance = 25 - ore = /obj/item/weapon/ore/phoron - -mineral/clown - display_name = "Bananium" - name = "Clown" - result_amount = 3 - spread = 0 - ore = /obj/item/weapon/ore/slag \ No newline at end of file + ore = /obj/item/weapon/ore/phoron \ No newline at end of file diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 8d06c87ef0..936c122e05 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -61,13 +61,6 @@ if (istype(O,/obj/item/stack/sheet/metal)) amt_iron += 100 * O.amount del(O) - if (istype(O,/obj/item/stack/sheet/mineral/clown)) - amt_clown += 100 * O.amount - del(O) - if (istype(O,/obj/item/stack/sheet/mineral/adamantine)) - amt_adamantine += 100 * O.amount - del(O) //Commented out for now. -Durandan - /obj/machinery/mineral/mint/attack_hand(user as mob) //TODO: Adamantine coins! -Durandan @@ -110,12 +103,6 @@ dat += text("chosen") else dat += text("Choose") - if(amt_clown > 0) - dat += text("
Bananium inserted: [amt_clown] ") - if (chosen == "clown") - dat += text("chosen") - else - dat += text("Choose") dat += text("
Adamantine inserted: [amt_adamantine] ")//I don't even know these color codes, so fuck it. if (chosen == "adamantine") dat += text("chosen") diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 0635c261bf..18c42d93db 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -50,8 +50,6 @@ dat += text("Phoron coins: [amt_phoron] Remove one
") if (amt_uranium) dat += text("Uranium coins: [amt_uranium] Remove one
") - if (amt_clown) - dat += text("Bananium coins: [amt_clown] Remove one
") if (amt_adamantine) dat += text("Adamantine coins: [amt_adamantine] Remove one
") user << browse("[dat]", "window=moneybag") diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index d05b5fcb16..56b8d0ad20 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -36,7 +36,7 @@ oretag = "gold" /datum/ore/diamond - smelts_to = /obj/item/stack/sheet/mineral/diamond + compresses_to = /obj/item/stack/sheet/mineral/diamond oretag = "diamond" /datum/ore/osmium diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index f02b179718..968faa2c41 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -73,8 +73,6 @@ dat += text("
Diamond ore: [amt_diamond]") if (amt_strange) dat += text("
Strange rocks: [amt_strange]") - if (amt_clown) - dat += text("
Bananium ore: [amt_clown]") usr << dat diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 87fb193bed..c35ec24839 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -867,7 +867,6 @@ //Sheets /obj/item/stack/sheet/mineral/phoron = list("phoron" = 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), diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 0ce3f5b011..b33f240214 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -16,7 +16,6 @@ The currently supporting non-reagent materials: - $gold (/obj/item/stack/gold). One sheet = 3750 units. - $uranium (/obj/item/stack/uranium). One sheet = 3750 units. - $diamond (/obj/item/stack/diamond). One sheet = 3750 units. -- $clown (/obj/item/stack/clown). One sheet = 3750 units. ("Bananium") (Insert new ones here) Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials. diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 71845ad6ff..ff104b871a 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -102,9 +102,6 @@ Note: Must be placed west/left of and R&D console to function. if(diamond_amount >= 2000) 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/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/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine(src.loc) G.amount = round(adamantine_amount / G.perunit) @@ -172,8 +169,6 @@ Note: Must be placed west/left of and R&D console to function. uranium_amount += amount * 2000 if(/obj/item/stack/sheet/mineral/diamond) diamond_amount += amount * 2000 - if(/obj/item/stack/sheet/mineral/clown) - clown_amount += amount * 2000 if(/obj/item/stack/sheet/mineral/adamantine) adamantine_amount += amount * 2000 else diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index e72c971891..6dc2ea249e 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -84,8 +84,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, return_name = "Uranium" if("diamond") return_name = "Diamond" - if("clown") - return_name = "Bananium" else for(var/R in typesof(/datum/reagent) - /datum/reagent) temp_reagent = null @@ -163,7 +161,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, else //The construction/deconstruction of the console code. ..() - + src.updateUsrDialog() return @@ -456,9 +454,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if("diamond") type = /obj/item/stack/sheet/mineral/diamond res_amount = "diamond_amount" - if("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) var/available_num_sheets = round(linked_lathe.vars[res_amount]/sheet.perunit) @@ -785,12 +781,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_lathe.diamond_amount >= 10000) dat += "(5 Sheets) " if(linked_lathe.diamond_amount >= 2000) dat += "(Max Sheets)" dat += "
" - //Bananium - dat += "* [linked_lathe.clown_amount] cm3 of Bananium || " - dat += "Eject: " - if(linked_lathe.clown_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.clown_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.clown_amount >= 2000) dat += "(Max Sheets)" if(3.3) //Protolathe Chemical Storage Submenu dat += "Main Menu || " diff --git a/code/unused/mining/datum_processing_recipe.dm b/code/unused/mining/datum_processing_recipe.dm index 3d6b9ca903..656e38f0ad 100644 --- a/code/unused/mining/datum_processing_recipe.dm +++ b/code/unused/mining/datum_processing_recipe.dm @@ -19,5 +19,4 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( 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("Phoron",list(/obj/item/weapon/ore/phoron),/obj/item/stack/sheet/mineral/phoron), - 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 dc4ca5b3af..ce866482a5 100644 --- a/code/unused/mining/machine_craftlathe_unused.dm +++ b/code/unused/mining/machine_craftlathe_unused.dm @@ -176,7 +176,6 @@ proc/check_craftlathe_recipe(var/list/param_recipe) 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",""))