From 8626e41c50c1564ce57162ee0addad352f6c68da Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Tue, 11 Mar 2025 17:47:37 +1300 Subject: [PATCH 1/7] Start to cold iron and a toy. Toy is fully functional but needs sprites and sounds. --- maplestation.dme | 2 + .../magic/mana/sources/mana_batteries.dm | 2 +- .../code/modules/magic/objects/cold_iron.dm | 10 +++++ .../story_content/dances_content/toys.dm | 44 +++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 maplestation_modules/code/modules/magic/objects/cold_iron.dm create mode 100644 maplestation_modules/story_content/dances_content/toys.dm 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..4fa4f67fbe61 --- /dev/null +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -0,0 +1,10 @@ +/datum/material/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 = "#dbdfdf" + categories = list(MAT_CATEGORY_ORE = FALSE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) + sheet_type = /obj/item/stack/sheet/iron + value_per_unit = 10000 / SHEET_MATERIAL_AMOUNT + tradable = FALSE + 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..d47b3c59d434 --- /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/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. + + From 05059dd7dabad38c4e69146e2fe3e75ce5bf2104 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Tue, 11 Mar 2025 18:29:49 +1300 Subject: [PATCH 2/7] makes cold iron actually iron --- maplestation_modules/code/modules/magic/objects/cold_iron.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maplestation_modules/code/modules/magic/objects/cold_iron.dm b/maplestation_modules/code/modules/magic/objects/cold_iron.dm index 4fa4f67fbe61..9d23c3f3c5c1 100644 --- a/maplestation_modules/code/modules/magic/objects/cold_iron.dm +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -1,4 +1,4 @@ -/datum/material/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" From ec8fa5e69de5c86c8bd7438117603b211cb0d231 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Tue, 11 Mar 2025 18:54:45 +1300 Subject: [PATCH 3/7] fixes --- maplestation_modules/story_content/dances_content/toys.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maplestation_modules/story_content/dances_content/toys.dm b/maplestation_modules/story_content/dances_content/toys.dm index d47b3c59d434..5b09e5e50481 100644 --- a/maplestation_modules/story_content/dances_content/toys.dm +++ b/maplestation_modules/story_content/dances_content/toys.dm @@ -23,7 +23,7 @@ icon = 'icons/obj/weapons/guns/toy.dmi' icon_state = "foamdart" base_icon_state = "foamdart" - custom_materials = list(/datum/material/cold_iron = SMALL_MATERIAL_AMOUNT) + custom_materials = list(/datum/material/iron/cold_iron = SMALL_MATERIAL_AMOUNT) harmful = FALSE /obj/projectile/bullet/foam_dart/novelty_flying_disc @@ -37,7 +37,7 @@ shrapnel_type = null embed_type = null ricochets_max = 5 - ricochet_chance = 700 //BOUNCY + 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. From f3c941fddc2f1066446dcbbe18910117d07506c0 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Mon, 17 Mar 2025 23:28:36 +1300 Subject: [PATCH 4/7] Cold iron sprites? --- .../code/modules/magic/objects/cold_iron.dm | 24 ++++++++++++++++-- .../icons/obj/magic/magic_metals.dmi | Bin 0 -> 1079 bytes 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 maplestation_modules/icons/obj/magic/magic_metals.dmi diff --git a/maplestation_modules/code/modules/magic/objects/cold_iron.dm b/maplestation_modules/code/modules/magic/objects/cold_iron.dm index 9d23c3f3c5c1..095dd4fa6342 100644 --- a/maplestation_modules/code/modules/magic/objects/cold_iron.dm +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -2,9 +2,29 @@ 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 = "#dbdfdf" + greyscale_colors = "#c6c9c9" + sheet_type = /obj/item/stack/sheet/cold_iron categories = list(MAT_CATEGORY_ORE = FALSE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) - sheet_type = /obj/item/stack/sheet/iron value_per_unit = 10000 / SHEET_MATERIAL_AMOUNT tradable = FALSE +/datum/reagent/iron/cold_iron + name = "Cold Iron" + description = "Pure 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 = "plasteel 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" + inhand_icon_state = "sheet-coldiron" + icon = 'MapleStationCode/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 + + 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 0000000000000000000000000000000000000000..3c817ebdc3f7c8929766f77341f102f52274a260 GIT binary patch literal 1079 zcmV-71jze|P)V=-0C)kFkg*DbKn#ZG%TolMTUzbfr6|QgUqM8pcc7l!MSXn_U33t1%Kwvm z@DU$>@juBhN)wpKSfzXX;^+ASF{_HDD`5aal4>Mx#d5*qqGu%$KT6$J%IMw$;ih$q zH;CF49c}sKJP+;y;YDB=4c(O5BbUVv(5ak{aTcxbT>z*BY+JV0;9vj%17Jx+K~#9! z?VCNT6G0e-H-A77w6IXHi?I-IClV{0fJlgqpa@Y?X%kXddMzzN8m)o`M8U=-h>*r2 z7{u<1g)yC=g@uCPABfDtz}}tg%)B3yFzb7oh1p%s$viuU*@e{R^LZlLooWI=00;n) z0EkYj)oNWFtJmu_0k8#)Mx%AB)iTCsvsu#b_dyT@0OHA46I}*CjYC#Kv;ep&0OO}7 zdORK**YtY5LtuRJLM0xdi2j4ghxrVEiBeTzSv{s!{<^zcfvq z06LwHcODdgDpdf~4+6j^4;VnzDgf$71yIa`2Jrml3*+3a8#jXipi}?`K$#x~fGrOS zfC_MK@4RvD^TDUgkQ)GX0-ykFeiQ(k@(2I{AOHja0)XxJ3xF*E$nS2n^tb>B2%z|K zRaAZlRcQdtX4ANKu~-BHpntF0YAbcSUE|)#WRe~A7QL*JDggje0UQ9dpL)Vw(ksL# zPjmn<6+i*t<44JZ24Jgz5CF7ayWMtHz;rrA=P5p5K9vKlBo+X+3J3v!QUMqM5I;&D zFo3czq4_1p`9;*nk24R4A0!V7fI1Ea1LNFqILwaR09;Glbsh?U>Icb#24GVN02E;W zgcJ#Yh*ttY00@BpeiC*HK&C(d2mp})5C9^W4&J>oUfA|7Ux)ucpjy+i9ld`1V12rN z#u)#$`kGw3_Yn5~fJ)9#;3r>AbQu6O4p|A&0^q6ujGvn5D|hZ2*SvlD=nxp6JW&GR ztN@JP$;O4`$kF4*b$|c-N`5Rqg7QQMfV%=Peh>hzJT*$N;#iCo0QLLw;f)i(*^5`b z^PmD&sRE#W5CA@Tz~QP^0Z>0GfMOmr09yrw06?h#41h8}3;x~0fK&hn0PUxqaF_H7@yQb%089l?0QmS(@}L3ODj);^ zN(Ep5K>R3q&;V=|5CQK|gST&k_;(%b+5002ovPDHLkV1g=%xt{<4 literal 0 HcmV?d00001 From 69d5575fb095216544f2935c31e34df18623adde Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Mon, 17 Mar 2025 23:29:56 +1300 Subject: [PATCH 5/7] fix --- maplestation_modules/code/modules/magic/objects/cold_iron.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maplestation_modules/code/modules/magic/objects/cold_iron.dm b/maplestation_modules/code/modules/magic/objects/cold_iron.dm index 095dd4fa6342..406cf3be308e 100644 --- a/maplestation_modules/code/modules/magic/objects/cold_iron.dm +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -3,7 +3,7 @@ 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/cold_iron + 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 = 10000 / SHEET_MATERIAL_AMOUNT tradable = FALSE From 357c739cea9c5354a93e84072f1d9180ddc933a0 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Mon, 17 Mar 2025 23:32:45 +1300 Subject: [PATCH 6/7] oh my god i should test things before pushing. FIXED --- maplestation_modules/code/modules/magic/objects/cold_iron.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maplestation_modules/code/modules/magic/objects/cold_iron.dm b/maplestation_modules/code/modules/magic/objects/cold_iron.dm index 406cf3be308e..873a3dd4d39c 100644 --- a/maplestation_modules/code/modules/magic/objects/cold_iron.dm +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -22,7 +22,7 @@ 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" inhand_icon_state = "sheet-coldiron" - icon = 'MapleStationCode/icons/obj/magic/magic_metals.dmi' + 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 From 5c41f25f6b662c16db4389c9aa6329d0f0a3d6f4 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Mon, 17 Mar 2025 23:50:26 +1300 Subject: [PATCH 7/7] Pure cold iron --- .../code/modules/magic/objects/cold_iron.dm | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/maplestation_modules/code/modules/magic/objects/cold_iron.dm b/maplestation_modules/code/modules/magic/objects/cold_iron.dm index 873a3dd4d39c..a60d78a77a4a 100644 --- a/maplestation_modules/code/modules/magic/objects/cold_iron.dm +++ b/maplestation_modules/code/modules/magic/objects/cold_iron.dm @@ -1,3 +1,5 @@ +//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." @@ -5,26 +7,42 @@ 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 = 10000 / SHEET_MATERIAL_AMOUNT + value_per_unit = 1000 / SHEET_MATERIAL_AMOUNT tradable = FALSE /datum/reagent/iron/cold_iron name = "Cold Iron" - description = "Pure cold iron is a magical metal." + 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 = "plasteel sheet" + 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" - inhand_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