From 5c6a6c7da0dd0b70d8d4c032bf7ea0243508e347 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 29 Dec 2023 23:41:41 -0600 Subject: [PATCH 1/8] Fix 'Zip' + 12g boxes --- .../icons/obj/ammunition/magazines.dmi | Bin 2891 -> 2890 bytes .../icons/obj/guns/tier0/pistol.dmi | Bin 891 -> 940 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index a8b5e989fcf56df9fe78d044ce8085cd1c607f0e..269d93b83d167e073b870cd6fe95244c6a81ef00 100644 GIT binary patch delta 301 zcmV+|0n+}<7RnZo%6}GmR9JLGWpiV4X>fFDZ*Bkpc$}SQxfS1>3D#0v>6>f=ix(KzuRx1Qu{|4SQ!C)epV+sn-^6OXdfO?#Is87%_gJe$JQ z!w@Rr)MZoEW*W4~O*t%GrLJAz3a4l~JmI`C2U*#b^hXR4@v1V0zz@u=sp(#GuU^LKJcq;t46kQcI|ZI8Ly_ zEC{}V5ydXoA6V=OS`gPKL?6ly<{mNN+XLkVvyK?}-bq!#L0|g{?C{G|f^RtXr;Dyz z!x8!H`A3MC1tF!0*%Wb`BBmXFuk=r^G~25u)BR@rb9e(~i#`h47pYLQ>H%R1$bgO9 delta 302 zcmV+}0nz@-7Rwfp%6}JnR9JLGWpiV4X>fFDZ*Bkpc$}4%%WlFj5JlJVS6HwP$~Xj8 zY$_09QGNkINt39wkz(`s{Ki2l>MCb;9_eW2-s_R&seRjQcYC{j-7~Q1?adOj4IkRflKc!!eZoapK&i%O)l{H=XZmG0A6l{C_T==l@h%K#uhjMy28) zI6n5&J`Pmki_H}0001h2m=5B0K2`CDUl&5k!2@B z3=9ku6chje06HQDkdTlrEiA08tSKiZK|wz)Ei1slz#=+mACkg2WQ&5r*snl!E&u=k z0d!JMQvg8b*k%9#0IiX;aewL-=j4~f7sY2J=A|HXnh>oshd7;Jw~^zrq|}@ef~M!^ zp{c`RKG+qxiRroq#49z#rBqqL)z1YSQ2_s8fNav?u-@DdBqTF_=LgOZ$UP(hX1>8700000Mt?+v65-l{BrLX( zBy_Ao5*AvXj$p1;ASCj~wNaBu#3g6JIL>D}cI{OXil{|Cq>*c{3X#ujoz5W>OgdYl zwhF_DxJg3eTU&L!vLC)gIdrt3JXs`Wf~s<={pS)~f9YM4%B!O%IQL7;3{?Z7*smLc zne?$o@{Nr0Jx700000004lo@hnj5V4kf^NtFzV%f_`)lUhDm zM9?1Rlf?-3$tSNHWW%$2_ky-JI23_>ct>EG0bU z>&>fc36?C&ynmiz$u@Isa5L=QeCb5N`_7k6Xg+o$^!;(mg25PqHmBJ8H3)dNpZl-x zAJ-Nf+x`C6wF3YE004kxJpFfUg}?tVzTo``0sw$*gyu1*Yq!qd;c&dB-8#q9>A=0} ybnVuWFJpENb?w&iehunA!tM2uE&u>j`~zQH4Yyff^9?8f0000+h8w?B# z6ciKy001I7XdjZoIAn`DA_juO*ucQRkxC~gkdTlrEiA08tSKiZK|wz)Eh}!E#BTrq z00DGTPE!Ct=GbNc005+svvGgM7w6=c=oaZ_B<7_cbea&YGlw{xV7HOxGF_1Q@kyyU zB?L{+&qGs(YQD09tDg%vNC7o@XIGoE4-5bR0t87!K~#90?V9Ow!Y~Yk;~bPiTaJMq z6dFp8_kYAH$0R0L0p(I@_xllMJh69UJ7%QF^8f$<9ASLIs7U+SH6VX{75z+BX$Df+ z3`5Y*u=;@s3lalin65-Pm;v7e71AjQ1~WiQU@DxN?A=01;Mjz|_|@RHO*A5R?gdEoBbftk&Y1Qw>9YqwqEA0E1BOv@w~ucplQBCM>C4{;dXwCp zoDRr9oqlqW>U+t|UFv^~HUMv+#b1NVfzufope;Bcrw&Gg>H`1(000007(@X`yL^GO zw)A>Lna~t00000Ko_VK71)3JI%N$x<(FlXUxwAU z>IQdHYz|z#pT1kl&IX z1H6k^{CflHOQ3JydfC4pK0d!x9UKndn)={c`2iq@3tcF0BE$dy002ovPDHLkV1kf8 BH~atq From 859df9e74728bad1b2cd9c1b65320e88f9d3f540 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:58:31 -0500 Subject: [PATCH 2/8] adds the stuff --- mods/persistence/modules/chargen/items.dm | 89 +++++++++++++++++++ .../chargen/storage/industrial_boxes.dm | 12 +++ .../modules/chargen/vending/industrial.dm | 20 +++++ 3 files changed, 121 insertions(+) create mode 100644 mods/persistence/modules/chargen/items.dm diff --git a/mods/persistence/modules/chargen/items.dm b/mods/persistence/modules/chargen/items.dm new file mode 100644 index 00000000000..01599fa331f --- /dev/null +++ b/mods/persistence/modules/chargen/items.dm @@ -0,0 +1,89 @@ +/obj/item/clothing/suit/chem_suit/cheap + name = "cheap chemical suit" + desc = "A suit that protects against chemical contamination. This one is cheaply-made and cannot be deconstructed for any meaningful resources. It is additionally much more difficult to move around in." + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) + origin_tech = "{'materials':0}" + color = "#33ffad" + +/obj/item/clothing/suit/chem_suit/disposable/Initialize() + . = ..() + LAZYSET(slowdown_per_slot, slot_wear_suit_str, 1.5) // same as a radsuit + +/obj/item/clothing/head/chem_hood/cheap + name = "cheap chemical hood" + desc = "A hood that protects the head from chemical contaminants. This one is cheaply-made and cannot be deconstructed for any meaningful resources." + color = "#33ffad" + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) + origin_tech = "{'materials':0}" + +/obj/item/pickaxe/cheap + name = "cheap pickaxe" + desc = "This pickaxe is made from 3D-printed paper and styrofoam. It takes a long time to dig anything with this." + icon_state = "preview" + icon = 'icons/obj/items/tool/drills/pickaxe.dmi' + digspeed = 80 // twice as long as a regular pick + origin_tech = "{'materials':0}" + drill_verb = "picking" + sharp = 1 + color = "#33ffad" + force = 5 + throwforce = 2 + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) + +/obj/item/flashlight/lantern/cheap + name = "cheap lantern" + desc = "A mining lantern. This one is made from 3D-printed paper and styrofoam; it doesn't emit much light." + icon = 'icons/obj/lighting/lantern.dmi' + force = 2 + attack_verb = list ("bludgeoned", "bashed", "whack") + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) + flashlight_range = 1.5 + light_wedge = LIGHT_OMNI + light_color = LIGHT_COLOR_FIRE + origin_tech = "{'materials':0}" + color = "#33ffad" + +/obj/item/tank/oxygen/cheap + name = "cheap oxygen tank" + desc = "A tank of oxygen. This one is made from 3D-printed paper and styrofoam; it doesn't have much capacity." + icon = 'icons/obj/items/tanks/tank_blue.dmi' + starting_pressure = list(/decl/material/gas/oxygen = 6 ATM) + volume = 90 + color = "#33ffad" + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) + force = 2 + +/obj/item/clothing/mask/breath/scba/cheap + desc = "A close-fitting self contained breathing apparatus mask. Can be connected to an air supply. This one is made from 3D-printed paper and styrofoam." + name = "\improper cheap SCBA mask" + icon = 'icons/clothing/mask/breath_scuba.dmi' + color = "#33ffad" + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) + +/obj/item/storage/ore/cheap + name = "cheap mining satchel" + desc = "This bag can be used to store and transport ores. This one is made from 3D-printed paper and styrofoam; it can't hold very much at all." + max_storage_space = 100 + color = "#33ffad" + material = /decl/material/solid/organic/paper + matter = list( + /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + ) \ No newline at end of file diff --git a/mods/persistence/modules/chargen/storage/industrial_boxes.dm b/mods/persistence/modules/chargen/storage/industrial_boxes.dm index 6ef6f17dae3..6854996fb43 100644 --- a/mods/persistence/modules/chargen/storage/industrial_boxes.dm +++ b/mods/persistence/modules/chargen/storage/industrial_boxes.dm @@ -127,3 +127,15 @@ startswith = list( /obj/item/storage/mre/random = 5 ) + +/obj/item/chargen_box/industrial/cheap_mining + name = "'Colonist's First' super-ultra-deluxe mining kit(TM)" + startswith = list( + /obj/item/pickaxe/cheap = 1, + /obj/item/clothing/suit/chem_suit/cheap = 1, + /obj/item/clothing/head/chem_hood/cheap = 1, + /obj/item/flashlight/lantern/cheap = 1, + /obj/item/tank/oxygen/cheap = 1, + /obj/item/clothing/mask/breath/scba/cheap = 1, + /obj/item/storage/ore/cheap = 1 + ) \ No newline at end of file diff --git a/mods/persistence/modules/chargen/vending/industrial.dm b/mods/persistence/modules/chargen/vending/industrial.dm index f204e14ae30..82c5114c744 100644 --- a/mods/persistence/modules/chargen/vending/industrial.dm +++ b/mods/persistence/modules/chargen/vending/industrial.dm @@ -42,3 +42,23 @@ /obj/item/chargen_box/industrial/ore_processor = 999, /obj/item/chargen_box/industrial/stirling = 999 ) + +/obj/machinery/vending/infini/industrial/crap_mining + name = "Brownstone Solutions Minefab Basic" + desc = "An engineering vendor that synthesizes exceptionally poor-quality mining equipment. On the bright side, the cash input is shorted out; everything is free!" + markup = 0 + icon_state = "tool" + icon_deny = "tool-deny" + icon_vend = "tool-vend" + vend_delay = 11 + base_type = /obj/machinery/vending/infini/industrial/crap_mining + products = list( + /obj/item/chargen_box/industrial/cheap_mining = 999, + /obj/item/pickaxe/cheap = 999, + /obj/item/clothing/suit/chem_suit/cheap = 999, + /obj/item/clothing/head/chem_hood/cheap = 999, + /obj/item/flashlight/lantern/cheap = 999, + /obj/item/tank/oxygen/cheap = 999, + /obj/item/clothing/mask/breath/scba/cheap = 999, + /obj/item/storage/ore/cheap = 999 + ) From 126e3f4bcb992f61b593f401f6a72d577b9f688e Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:59:06 -0500 Subject: [PATCH 3/8] Update nebula.dme --- nebula.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/nebula.dme b/nebula.dme index 5098fb8015a..c4e68b3e6f9 100644 --- a/nebula.dme +++ b/nebula.dme @@ -3648,6 +3648,7 @@ #include "mods\_modpack.dm" #include "mods\persistence\sequential_guid.dm" #include "mods\persistence\controllers\subsystems\trade_beacons.dm" +#include "mods\persistence\modules\chargen\items.dm" #include "mods\persistence\modules\trade_beacons\exports.dm" #include "mods\persistence\modules\trade_beacons\imports.dm" #include "mods\persistence\modules\trade_beacons\trade_beacons.dm" From 11545f7887dda94cb9a370ad0a2f94760cf67f0e Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:22:16 -0500 Subject: [PATCH 4/8] oops --- mods/persistence/_persistence.dme | 1 + mods/persistence/modules/chargen/items.dm | 21 +++++++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index 8a0d511ce37..7e0d2780002 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -101,6 +101,7 @@ #include "modules\augment\active\cyberbrain.dm" #include "modules\chargen\_chargen.dm" #include "modules\chargen\dossier_console.dm" +#include "modules\chargen\items.dm" #include "modules\chargen\launch_pod.dm" #include "modules\chargen\defines\origins.dm" #include "modules\chargen\defines\perks_flaws.dm" diff --git a/mods/persistence/modules/chargen/items.dm b/mods/persistence/modules/chargen/items.dm index 01599fa331f..40ebe36ca3d 100644 --- a/mods/persistence/modules/chargen/items.dm +++ b/mods/persistence/modules/chargen/items.dm @@ -5,10 +5,10 @@ matter = list( /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT ) - origin_tech = "{'materials':0}" + origin_tech = "{'materials':1}" color = "#33ffad" -/obj/item/clothing/suit/chem_suit/disposable/Initialize() +/obj/item/clothing/suit/chem_suit/cheap/Initialize() . = ..() LAZYSET(slowdown_per_slot, slot_wear_suit_str, 1.5) // same as a radsuit @@ -20,7 +20,7 @@ matter = list( /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT ) - origin_tech = "{'materials':0}" + origin_tech = "{'materials':1}" /obj/item/pickaxe/cheap name = "cheap pickaxe" @@ -28,7 +28,7 @@ icon_state = "preview" icon = 'icons/obj/items/tool/drills/pickaxe.dmi' digspeed = 80 // twice as long as a regular pick - origin_tech = "{'materials':0}" + origin_tech = "{'materials':1}" drill_verb = "picking" sharp = 1 color = "#33ffad" @@ -42,24 +42,18 @@ /obj/item/flashlight/lantern/cheap name = "cheap lantern" desc = "A mining lantern. This one is made from 3D-printed paper and styrofoam; it doesn't emit much light." - icon = 'icons/obj/lighting/lantern.dmi' force = 2 - attack_verb = list ("bludgeoned", "bashed", "whack") material = /decl/material/solid/organic/paper matter = list( /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT ) flashlight_range = 1.5 - light_wedge = LIGHT_OMNI - light_color = LIGHT_COLOR_FIRE - origin_tech = "{'materials':0}" + origin_tech = "{'materials':1}" color = "#33ffad" /obj/item/tank/oxygen/cheap name = "cheap oxygen tank" desc = "A tank of oxygen. This one is made from 3D-printed paper and styrofoam; it doesn't have much capacity." - icon = 'icons/obj/items/tanks/tank_blue.dmi' - starting_pressure = list(/decl/material/gas/oxygen = 6 ATM) volume = 90 color = "#33ffad" material = /decl/material/solid/organic/paper @@ -67,6 +61,7 @@ /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT ) force = 2 + origin_tech = "{'materials':1}" /obj/item/clothing/mask/breath/scba/cheap desc = "A close-fitting self contained breathing apparatus mask. Can be connected to an air supply. This one is made from 3D-printed paper and styrofoam." @@ -77,6 +72,7 @@ matter = list( /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT ) + origin_tech = "{'materials':1}" /obj/item/storage/ore/cheap name = "cheap mining satchel" @@ -86,4 +82,5 @@ material = /decl/material/solid/organic/paper matter = list( /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT - ) \ No newline at end of file + ) + origin_tech = "{'materials':1}" \ No newline at end of file From d3198f95675ff08452d0e504795ef17e6890dc38 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:22:25 -0500 Subject: [PATCH 5/8] Revert "Update nebula.dme" This reverts commit 126e3f4bcb992f61b593f401f6a72d577b9f688e. --- nebula.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/nebula.dme b/nebula.dme index c4e68b3e6f9..5098fb8015a 100644 --- a/nebula.dme +++ b/nebula.dme @@ -3648,7 +3648,6 @@ #include "mods\_modpack.dm" #include "mods\persistence\sequential_guid.dm" #include "mods\persistence\controllers\subsystems\trade_beacons.dm" -#include "mods\persistence\modules\chargen\items.dm" #include "mods\persistence\modules\trade_beacons\exports.dm" #include "mods\persistence\modules\trade_beacons\imports.dm" #include "mods\persistence\modules\trade_beacons\trade_beacons.dm" From 6999f2cb1a16c331d93c221887e1d50a7d1b56cd Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:51:19 -0500 Subject: [PATCH 6/8] reinforced styrofoam --- mods/persistence/modules/chargen/items.dm | 45 ++++++++++++++++------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/mods/persistence/modules/chargen/items.dm b/mods/persistence/modules/chargen/items.dm index 40ebe36ca3d..a1e3f1de859 100644 --- a/mods/persistence/modules/chargen/items.dm +++ b/mods/persistence/modules/chargen/items.dm @@ -16,9 +16,9 @@ name = "cheap chemical hood" desc = "A hood that protects the head from chemical contaminants. This one is cheaply-made and cannot be deconstructed for any meaningful resources." color = "#33ffad" - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/steel/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE ) origin_tech = "{'materials':1}" @@ -34,18 +34,18 @@ color = "#33ffad" force = 5 throwforce = 2 - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/steel/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE ) /obj/item/flashlight/lantern/cheap name = "cheap lantern" desc = "A mining lantern. This one is made from 3D-printed paper and styrofoam; it doesn't emit much light." force = 2 - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/steel/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE ) flashlight_range = 1.5 origin_tech = "{'materials':1}" @@ -56,9 +56,9 @@ desc = "A tank of oxygen. This one is made from 3D-printed paper and styrofoam; it doesn't have much capacity." volume = 90 color = "#33ffad" - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/steel/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE ) force = 2 origin_tech = "{'materials':1}" @@ -68,9 +68,9 @@ name = "\improper cheap SCBA mask" icon = 'icons/clothing/mask/breath_scuba.dmi' color = "#33ffad" - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/steel/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE ) origin_tech = "{'materials':1}" @@ -79,8 +79,27 @@ desc = "This bag can be used to store and transport ores. This one is made from 3D-printed paper and styrofoam; it can't hold very much at all." max_storage_space = 100 color = "#33ffad" - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/steel/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + ) + origin_tech = "{'materials':1}" + +/decl/material/solid/metal/steel/r_styrofoam + name = "reinforced styrofoam" + codex_name = "reinforced styrofoam" + uid = "cheap_steel" + lore_text = "A form of styrofoam that is considerably more durable than regular styrofoam, but still worse than most metals. Often used for low-end tool fabrication." + wall_support_value = MAT_VALUE_EXTREMELY_LIGHT + hardness = MAT_VALUE_SOFT + integrity = 10 + brute_armor = 0 + hitsound = 'sound/weapons/smash.ogg' + construction_difficulty = MAT_VALUE_VERY_HARD_DIY + value = 0.1 + dissolves_into = list( + /decl/material/solid/metal/steel/fake = 1 ) - origin_tech = "{'materials':1}" \ No newline at end of file + default_solid_form = /obj/item/stack/material/panel + sound_manipulate = 'sound/foley/paperpickup2.ogg' + sound_dropped = 'sound/foley/paperpickup1.ogg' \ No newline at end of file From ee5c5193a5b682e3209daddc59bd53fdc2d09195 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:52:46 -0500 Subject: [PATCH 7/8] oops --- mods/persistence/modules/chargen/items.dm | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mods/persistence/modules/chargen/items.dm b/mods/persistence/modules/chargen/items.dm index a1e3f1de859..4304a59df99 100644 --- a/mods/persistence/modules/chargen/items.dm +++ b/mods/persistence/modules/chargen/items.dm @@ -1,9 +1,9 @@ /obj/item/clothing/suit/chem_suit/cheap name = "cheap chemical suit" desc = "A suit that protects against chemical contamination. This one is cheaply-made and cannot be deconstructed for any meaningful resources. It is additionally much more difficult to move around in." - material = /decl/material/solid/organic/paper + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/organic/paper = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) origin_tech = "{'materials':1}" color = "#33ffad" @@ -16,9 +16,9 @@ name = "cheap chemical hood" desc = "A hood that protects the head from chemical contaminants. This one is cheaply-made and cannot be deconstructed for any meaningful resources." color = "#33ffad" - material = /decl/material/solid/metal/steel/r_styrofoam + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) origin_tech = "{'materials':1}" @@ -34,18 +34,18 @@ color = "#33ffad" force = 5 throwforce = 2 - material = /decl/material/solid/metal/steel/r_styrofoam + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) /obj/item/flashlight/lantern/cheap name = "cheap lantern" desc = "A mining lantern. This one is made from 3D-printed paper and styrofoam; it doesn't emit much light." force = 2 - material = /decl/material/solid/metal/steel/r_styrofoam + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) flashlight_range = 1.5 origin_tech = "{'materials':1}" @@ -56,9 +56,9 @@ desc = "A tank of oxygen. This one is made from 3D-printed paper and styrofoam; it doesn't have much capacity." volume = 90 color = "#33ffad" - material = /decl/material/solid/metal/steel/r_styrofoam + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) force = 2 origin_tech = "{'materials':1}" @@ -79,13 +79,13 @@ desc = "This bag can be used to store and transport ores. This one is made from 3D-printed paper and styrofoam; it can't hold very much at all." max_storage_space = 100 color = "#33ffad" - material = /decl/material/solid/metal/steel/r_styrofoam + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) origin_tech = "{'materials':1}" -/decl/material/solid/metal/steel/r_styrofoam +/decl/material/solid/metal/iron/r_styrofoam name = "reinforced styrofoam" codex_name = "reinforced styrofoam" uid = "cheap_steel" @@ -98,7 +98,7 @@ construction_difficulty = MAT_VALUE_VERY_HARD_DIY value = 0.1 dissolves_into = list( - /decl/material/solid/metal/steel/fake = 1 + /decl/material/solid/metal/iron/r_styrofoam = 1 ) default_solid_form = /obj/item/stack/material/panel sound_manipulate = 'sound/foley/paperpickup2.ogg' From c71a1978d5b6fadf85a1729ee9d14f3f08b7b276 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 12 Jan 2024 23:04:14 -0500 Subject: [PATCH 8/8] Update items.dm --- mods/persistence/modules/chargen/items.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/persistence/modules/chargen/items.dm b/mods/persistence/modules/chargen/items.dm index 4304a59df99..8194865d7ec 100644 --- a/mods/persistence/modules/chargen/items.dm +++ b/mods/persistence/modules/chargen/items.dm @@ -68,9 +68,9 @@ name = "\improper cheap SCBA mask" icon = 'icons/clothing/mask/breath_scuba.dmi' color = "#33ffad" - material = /decl/material/solid/metal/steel/r_styrofoam + material = /decl/material/solid/metal/iron/r_styrofoam matter = list( - /decl/material/solid/metal/steel/r_styrofoam = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/iron/r_styrofoam = MATTER_AMOUNT_TRACE ) origin_tech = "{'materials':1}" @@ -96,7 +96,7 @@ brute_armor = 0 hitsound = 'sound/weapons/smash.ogg' construction_difficulty = MAT_VALUE_VERY_HARD_DIY - value = 0.1 + value = 0.01 dissolves_into = list( /decl/material/solid/metal/iron/r_styrofoam = 1 )