diff --git a/maplestation.dme b/maplestation.dme index 042516c97873..6206db85718a 100644 --- a/maplestation.dme +++ b/maplestation.dme @@ -6470,6 +6470,7 @@ #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_attunements.dm" #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_intensities.dm" #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_variable.dm" +#include "maplestation_modules\code\modules\magic\objects\cold_iron.dm" #include "maplestation_modules\code\modules\magic\story_spells\acid_touch.dm" #include "maplestation_modules\code\modules\magic\story_spells\airhike.dm" #include "maplestation_modules\code\modules\magic\story_spells\convect.dm" @@ -6609,6 +6610,7 @@ #include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\ppc_override.dm" #include "maplestation_modules\story_content\armored_corps\code\melee\void_blade.dm" #include "maplestation_modules\story_content\bell_equipment\code\bellclothing.dm" +#include "maplestation_modules\story_content\dances_content\toys.dm" #include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm" #include "maplestation_modules\story_content\jessie_equipment\code\jessie_clothing.dm" #include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm" diff --git a/maplestation_modules/code/modules/magic/mana/sources/mana_batteries.dm b/maplestation_modules/code/modules/magic/mana/sources/mana_batteries.dm index 8744957b2072..4c9dd2cc835b 100644 --- a/maplestation_modules/code/modules/magic/mana/sources/mana_batteries.dm +++ b/maplestation_modules/code/modules/magic/mana/sources/mana_batteries.dm @@ -124,7 +124,7 @@ icon_state = "lignite" grind_results = list(/datum/reagent/volite_powder = 5, /datum/reagent/carbon = 5) -///Just like coal, if the temperature of the object is over 300, then ignite +///Just like coal, if the temperature of the Volicious lignite is over 300, then ignite /obj/item/mana_battery/mana_crystal/lignite/attackby(obj/item/W, mob/user, params) if(W.get_temperature() > 300) var/turf/T = get_turf(src) diff --git a/maplestation_modules/code/modules/magic/objects/cold_iron.dm b/maplestation_modules/code/modules/magic/objects/cold_iron.dm new file mode 100644 index 000000000000..a60d78a77a4a --- /dev/null +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -0,0 +1,48 @@ +//Cold-iron + +/datum/material/iron/cold_iron + name = "Cold Wrought Iron" + desc = "A handforged magical iron metal. It is very difficult to make and commands a very high price point." + color = "#c6c9c9" + greyscale_colors = "#c6c9c9" + sheet_type = /obj/item/stack/sheet/iron/cold_iron + categories = list(MAT_CATEGORY_ORE = FALSE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) + value_per_unit = 1000 / SHEET_MATERIAL_AMOUNT + tradable = FALSE + +/datum/reagent/iron/cold_iron + name = "Cold Iron" + description = "Cold iron is a magical metal." + taste_description = "spicy iron" + material = /datum/material/iron/cold_iron + color = "#c6c9c9" + +/obj/item/stack/sheet/iron/cold_iron + name = "Cold Wrought Iron" + singular_name = "Cold Wrought Iron sheet" + desc = "A sheet of handforged magical iron metal. It is very difficult to make and commands a very high price point." + icon_state = "sheet-coldiron" + icon = 'maplestation_modules/icons/obj/magic/magic_metals.dmi' + merge_type = /obj/item/stack/sheet/iron/cold_iron + grind_results = list(/datum/reagent/iron/cold_iron = 20) + material_type = /datum/material/iron/cold_iron + +//pure cold iron +/datum/material/iron/cold_iron/pure + name = "Pure Cold Wrought Iron" + desc = "A perfectly pure handforged magical iron metal. It appears to almost glow." + color = "#cecdc3" + greyscale_colors = "#cecdc3" + sheet_type = /obj/item/stack/sheet/iron/cold_iron/pure + value_per_unit = 10000 / SHEET_MATERIAL_AMOUNT + tradable = FALSE + + +/obj/item/stack/sheet/iron/cold_iron/pure + name = "Pure Cold Wrought Iron" + singular_name = "Pure Cold Wrought Iron sheet" + desc = "A perfectly pure sheet of handforged magical iron metal. It is very difficult to make and commands an extremely high price point." + icon_state = "sheet-purecoldiron" + merge_type = /obj/item/stack/sheet/iron/cold_iron/pure + grind_results = list(/datum/reagent/iron/cold_iron = 20) //loses its grandeur when grinded. its all in the crystal structure, maybe! + material_type = /datum/material/iron/cold_iron/pure diff --git a/maplestation_modules/icons/obj/magic/magic_metals.dmi b/maplestation_modules/icons/obj/magic/magic_metals.dmi new file mode 100644 index 000000000000..3c817ebdc3f7 Binary files /dev/null and b/maplestation_modules/icons/obj/magic/magic_metals.dmi differ diff --git a/maplestation_modules/story_content/dances_content/toys.dm b/maplestation_modules/story_content/dances_content/toys.dm new file mode 100644 index 000000000000..5b09e5e50481 --- /dev/null +++ b/maplestation_modules/story_content/dances_content/toys.dm @@ -0,0 +1,44 @@ + +//--A gift from CaLE to Dances! CaLE had fun making it! +//disc shooter +/obj/item/gun/ballistic/shotgun/toy/disc_launcher + name = "Prototype disc launcher for rapid! firing™️" + desc = "A small toy disc launcher. Copyright Dances-in-Dreams." + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy/disc_launcher + semi_auto = TRUE + pb_knockback = 3 + +/obj/item/ammo_box/magazine/internal/shot/toy/disc_launcher + name = "Prototype disc launcher for rapid! firing™️ Novelty flying disc firing mechanism" + icon_state = "9x19p" + max_ammo = 3 + multiple_sprites = AMMO_BOX_FULL_EMPTY + ammo_type = /obj/item/ammo_casing/foam_dart/novelty_flying_disc + +/obj/item/ammo_casing/foam_dart/novelty_flying_disc + name = "\improper MICRO prototype Dances-In-Dreams' Novelty flying disc made of cold wrought iron that fits in your hand and you can launch! over 200 feet as you grip it skip it curve it or jam it™️" + desc = "A small shining metal disc. Copyright Dances-in-Dreams." + projectile_type = /obj/projectile/bullet/foam_dart/novelty_flying_disc + caliber = CALIBER_FOAM + icon = 'icons/obj/weapons/guns/toy.dmi' + icon_state = "foamdart" + base_icon_state = "foamdart" + custom_materials = list(/datum/material/iron/cold_iron = SMALL_MATERIAL_AMOUNT) + harmful = FALSE + +/obj/projectile/bullet/foam_dart/novelty_flying_disc + name = "MICRO prototype Dances-In-Dreams' Novelty flying disc made of cold wrought iron that fits in your hand and you can launch! over 200 feet as you grip it skip it curve it or jam it™️" + desc = "A small shining metal disc. Copyright Dances-in-Dreams." + damage = 0 // It's a toy. + damage_type = OXY + icon = 'icons/obj/weapons/guns/toy.dmi' + icon_state = "foamdart_proj" + base_icon_state = "foamdart" + shrapnel_type = null + embed_type = null + ricochets_max = 5 + ricochet_chance = 700 //BOUNCY!! + ricochet_incidence_leeway = 0 + range = 70 //assuming each tile is 3 feet this should be about 210 feet, aka, over 200 feet. Yes this is big. + +