Merge pull request #3 from FalloutFalcon/awful-ore

Cloak Varients and intergration in ruins

_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

@@ -84,8 +84,8 @@
 "cN" = (
 /obj/structure/safe/floor,
 /obj/item/hand_tele,
-/obj/item/stack/sheet/mineral/adamantine,
-/obj/item/stack/sheet/mineral/adamantine,
+/obj/item/stack/sheet/mineral/hidden/hellstone,
+/obj/item/stack/sheet/mineral/hidden/hellstone,
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/ruin/unpowered/corprejectrooms)
 "cP" = (
@@ -1726,11 +1726,11 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/stack/sheet/bluespace_crystal/five,
-/obj/item/stack/sheet/mineral/bananium{
+/obj/item/stack/sheet/mineral/hidden/hellstone{
 	amount = 15
 	},
 /obj/item/stack/sheet/mineral/gold/twenty,
-/obj/item/stack/sheet/mineral/runite/ten,
+/obj/item/stack/sheet/mineral/hidden/hellstone/ten,
 /obj/item/toy/figure/captain,
 /obj/item/organ/cyberimp/brain/anti_stun,
 /obj/item/disk/design_disk/adv/knight_gear,

_maps/RandomRuins/SpaceRuins/crashedship.dmm

@@ -2232,7 +2232,7 @@
 /turf/closed/mineral/diamond,
 /area/awaymission/BMPship)
 "hw" = (
-/turf/closed/mineral/bananium,
+/turf/closed/mineral/bscrystal,
 /area/awaymission/BMPship)
 "hE" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,

_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm

@@ -96,7 +96,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "r" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/ore/bananium,
+/obj/item/stack/ore/hellstone,
 /turf/open/floor/plating/asteroid,
 /area/overmap_encounter/planetoid/cave/explored)
 "s" = (

_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm

@@ -342,7 +342,7 @@
 "cX" = (
 /obj/structure/statue/bananium/clown,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "dg" = (
 /obj/structure/sign/poster/contraband/eat,
@@ -430,7 +430,7 @@
 /area/ruin/powered)
 "ed" = (
 /obj/item/trash/cheesie,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "ee" = (
 /obj/machinery/photocopier,
@@ -578,12 +578,8 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "fk" = (
-/obj/machinery/door/airlock/bananium{
-	name = "Clown Embassy";
-	dir = 4
-	},
 /obj/item/grown/bananapeel,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "fn" = (
 /obj/effect/gibspawner/human,
@@ -695,7 +691,7 @@
 /area/ruin/powered)
 "go" = (
 /obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "gp" = (
 /mob/living/simple_animal/hostile/rat,
@@ -735,7 +731,7 @@
 /turf/open/floor/plating,
 /area/ruin/powered)
 "gL" = (
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "gM" = (
 /obj/structure/rack,
@@ -762,7 +758,7 @@
 /area/ruin/powered)
 "hd" = (
 /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "he" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1123,7 +1119,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "kO" = (
 /obj/item/trash/chips,
@@ -1133,7 +1129,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "kS" = (
 /obj/effect/decal/cleanable/blood,
@@ -1507,7 +1503,7 @@
 /obj/item/pneumatic_cannon/pie,
 /obj/item/reagent_containers/spray/waterflower/lube,
 /obj/machinery/light/small/directional/east,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "nK" = (
 /obj/structure/table,
@@ -2375,7 +2371,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "vX" = (
 /obj/item/ammo_casing,
@@ -2773,7 +2769,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/generic,
 /obj/item/trash/cheesie,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "Aa" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3113,7 +3109,7 @@
 /area/ruin/powered)
 "Cy" = (
 /obj/structure/closet/cardboard,
-/obj/item/coin/bananium,
+/obj/item/coin/hellstone,
 /obj/item/reagent_containers/food/snacks/soup/clownstears,
 /turf/open/floor/plating,
 /area/ruin/powered)
@@ -4333,7 +4329,7 @@
 "Ow" = (
 /obj/structure/table/wood/fancy/orange,
 /obj/item/clothing/under/rank/civilian/clown/rainbow,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "Ox" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4422,7 +4418,7 @@
 /area/ruin/powered)
 "Pr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/mineral/hellstone,
 /area/ruin/powered)
 "Px" = (
 /mob/living/simple_animal/hostile/rat,

_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm

@@ -2868,7 +2868,7 @@
 	pixel_x = 4;
 	pixel_y = 8
 	},
-/obj/item/coin/adamantine{
+/obj/item/coin/hellstone{
 	pixel_x = -12;
 	pixel_y = -3
 	},

code/__DEFINES/icon_smoothing.dm

@@ -99,7 +99,6 @@ DEFINE_BITFIELD(smoothing_flags, list(
 #define SMOOTH_GROUP_SILVER_WALLS S_OBJ(3) ///turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver
 #define SMOOTH_GROUP_DIAMOND_WALLS S_OBJ(4) ///turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond
 #define SMOOTH_GROUP_PLASMA_WALLS S_OBJ(5) ///turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma
-#define SMOOTH_GROUP_BANANIUM_WALLS S_OBJ(6) ///turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium
 #define SMOOTH_GROUP_SANDSTONE_WALLS S_OBJ(7) ///turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone
 #define SMOOTH_GROUP_WOOD_WALLS S_OBJ(8) ///turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood
 #define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron

code/controllers/subsystem/traumas.dm

@@ -128,7 +128,7 @@ SUBSYSTEM_DEF(traumas)
 			/obj/item/melee/cultblade, /obj/item/cult_bastard,
 			/obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
 			/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
-			/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
+			/obj/machinery/door/airlock/cult, /obj/singularity/narsie,
 			/obj/item/soulstone,
 			/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
 			/obj/item/clothing/suit/space/hardsuit/shielded/wizard, /obj/item/clothing/suit/space/hardsuit/wizard,

code/datums/components/crafting/recipes/misc.dm

@@ -211,3 +211,10 @@
 				/obj/item/organ/heart = 1,
 				/obj/item/stack/sheet/cotton/cloth = 3)
 	category = CAT_MISC
+
+/datum/crafting_recipe/candorupgrade
+	name = "Candor Upgrade"
+	result = /obj/item/gun/ballistic/automatic/pistol/candor/phenex
+	reqs = list(/obj/item/stack/sheet/mineral/hidden = 4,
+				/obj/item/gun/ballistic/automatic/pistol/candor = 1)
+	category = CAT_MISC

code/datums/components/remote_materials.dm

@@ -52,7 +52,7 @@ handles linking back and forth.
 		/datum/material/diamond,
 		/datum/material/plasma,
 		/datum/material/uranium,
-		/datum/material/bananium,
+		/datum/material/hellstone,
 		/datum/material/titanium,
 		/datum/material/bluespace,
 		/datum/material/plastic,

code/datums/materials/basemats.dm

@@ -127,30 +127,6 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	ore_type = /obj/item/stack/ore/bluespace_crystal
 	value_per_unit = 0.15
 
-///Honks and slips
-/datum/material/bananium
-	name = "bananium"
-	id = "bananium"
-	desc = "Material with hilarious properties"
-	color = "#ffff00" //obnoxiously bright yellow
-	categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
-	sheet_type = /obj/item/stack/sheet/mineral/bananium
-	ore_type = /obj/item/stack/ore/bananium
-	value_per_unit = 0.5
-	beauty_modifier = 0.5
-	armor_modifiers = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0) //Clowns cant be blown away.
-
-/datum/material/bananium/on_applied(atom/source, amount, material_flags)
-	. = ..()
-	source.LoadComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50, falloff_exponent = 20)
-	source.AddComponent(/datum/component/slippery, min(amount / 10, 80))
-
-
-/datum/material/bananium/on_removed(atom/source, amount, material_flags)
-	. = ..()
-	qdel(source.GetComponent(/datum/component/slippery))
-	qdel(source.GetComponent(/datum/component/squeak))
-
 
 ///Mediocre force increase
 /datum/material/titanium
@@ -166,18 +142,6 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	beauty_modifier = 0.05
 	armor_modifiers = list("melee" = 1.35, "bullet" = 1.3, "laser" = 1.3, "energy" = 1.25, "bomb" = 1.25, "bio" = 1, "rad" = 1, "fire" = 0.7, "acid" = 1)
 
-/datum/material/runite
-	name = "runite"
-	id = "runite"
-	desc = "Runite"
-	color = "#3F9995"
-	strength_modifier = 1.3
-	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
-	sheet_type = /obj/item/stack/sheet/mineral/runite
-	value_per_unit = 0.3
-	beauty_modifier = 0.5
-	armor_modifiers = list("melee" = 1.35, "bullet" = 2, "laser" = 0.5, "energy" = 1.25, "bomb" = 1.25, "bio" = 1, "rad" = 1, "fire" = 1.4, "acid" = 1) //rune is weak against magic lasers but strong against bullets. This is the combat triangle.
-
 ///Force decrease
 /datum/material/plastic
 	name = "plastic"
@@ -224,42 +188,20 @@ Unless you know what you're doing, only use the first three numbers. They're in
 		var/obj/wooden = source
 		wooden.resistance_flags &= ~FLAMMABLE
 
-///Stronk force increase
-/datum/material/adamantine
-	name = "adamantine"
-	id = "adamantine"
-	desc = "A powerful material made out of magic, I mean science!"
-	color = "#6d7e8e"
+//Remember when the theme used to be "Eerie" before 1.3? Good times.
+/datum/material/hellstone
+	name = "hellstone"
+	id = "hellstone"
+	desc = "A colloquialism given to millenia-old slag, heat-treated through the eons in deep magma."
+	color = "#ffaf5e"
 	strength_modifier = 1.5
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
-	sheet_type = /obj/item/stack/sheet/mineral/adamantine
+	sheet_type = /obj/item/stack/sheet/mineral/hidden/hellstone
+	ore_type = /obj/item/stack/ore/hellstone
 	value_per_unit = 0.25
 	beauty_modifier = 0.4
 	armor_modifiers = list("melee" = 1.5, "bullet" = 1.5, "laser" = 1.3, "energy" = 1.3, "bomb" = 1, "bio" = 1, "rad" = 1, "fire" = 2.5, "acid" = 1)
 
-///RPG Magic.
-/datum/material/mythril
-	name = "mythril"
-	id = "mythril"
-	desc = "How this even exists is byond me"
-	color = "#f2d5d7"
-	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
-	sheet_type = /obj/item/stack/sheet/mineral/mythril
-	value_per_unit = 0.75
-	strength_modifier = 1.2
-	armor_modifiers = list("melee" = 1.5, "bullet" = 1.5, "laser" = 1.5, "energy" = 1.5, "bomb" = 1.5, "bio" = 1.5, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
-	beauty_modifier = 0.5
-
-/datum/material/mythril/on_applied_obj(atom/source, amount, material_flags)
-	. = ..()
-	if(istype(source, /obj/item))
-		source.AddComponent(/datum/component/fantasy)
-
-/datum/material/mythril/on_removed_obj(atom/source, material_flags)
-	. = ..()
-	if(istype(source, /obj/item))
-		qdel(source.GetComponent(/datum/component/fantasy))
-
 //formed when freon react with o2, emits a lot of plasma when heated
 /datum/material/hot_ice
 	name = "hot ice"
@@ -323,18 +265,6 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	turf_sound_override = FOOTSTEP_SAND
 	texture_layer_icon_state = "sand"
 
-/datum/material/runedmetal
-	name = "runed metal"
-	id = "runed metal"
-	desc = "Mir'ntrath barhah Nar'sie."
-	color = "#3C3434"
-	categories = list(MAT_CATEGORY_RIGID = TRUE)
-	sheet_type = /obj/item/stack/sheet/runed_metal
-	value_per_unit = 0.75
-	armor_modifiers = list("melee" = 1.2, "bullet" = 1.2, "laser" = 1, "energy" = 1, "bomb" = 1.2, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
-	beauty_modifier = -0.15
-	texture_layer_icon_state = "runed"
-
 /datum/material/bronze
 	name = "bronze"
 	id = "bronze"

code/game/gamemodes/clown_ops/clown_weapons.dm

@@ -40,14 +40,14 @@
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize()
 	. = ..()
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
-	bananium.insert_amount_mat(max_recharge, /datum/material/bananium)
+	bananium.insert_amount_mat(max_recharge, /datum/material/hellstone)
 	START_PROCESSING(SSobj, src)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process()
 	var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
-	var/bananium_amount = bananium.get_material_amount(/datum/material/bananium)
+	var/bananium_amount = bananium.get_material_amount(/datum/material/hellstone)
 	if(bananium_amount < max_recharge)
-		bananium.insert_amount_mat(min(recharge_rate, max_recharge - bananium_amount), /datum/material/bananium)
+		bananium.insert_amount_mat(min(recharge_rate, max_recharge - bananium_amount), /datum/material/hellstone)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/attack_self(mob/user)
 	ui_action_click(user)

code/game/machinery/doors/airlock_types.dm

@@ -264,17 +264,7 @@
 	opacity = FALSE
 	glass = TRUE
 
-/obj/machinery/door/airlock/bananium
-	name = "bananium airlock"
-	desc = "Honkhonkhonk"
-	icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
-	assemblytype = /obj/structure/door_assembly/door_assembly_bananium
-	doorOpen = 'sound/items/bikehorn.ogg'
-	has_hatch = FALSE
 
-/obj/machinery/door/airlock/bananium/glass
-	opacity = FALSE
-	glass = TRUE
 
 /obj/machinery/door/airlock/sandstone
 	name = "sandstone airlock"

code/game/machinery/recycler.dm

@@ -21,7 +21,7 @@
 
 /obj/machinery/recycler/Initialize()
 	AddComponent(/datum/component/butchering/recycler, 1, amount_produced,amount_produced/5)
-	AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/plasma, /datum/material/gold, /datum/material/diamond, /datum/material/plastic, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace), INFINITY, FALSE, null, null, null, TRUE)
+	AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/plasma, /datum/material/gold, /datum/material/diamond, /datum/material/plastic, /datum/material/uranium, /datum/material/hellstone, /datum/material/titanium, /datum/material/bluespace), INFINITY, FALSE, null, null, null, TRUE)
 	. = ..()
 	update_appearance()
 	req_one_access = get_all_accesses() + get_all_centcom_access()