From ae134e245c53c6a0f9b092edf6e16ad765393697 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Sun, 2 Nov 2014 12:17:29 -0800 Subject: [PATCH] Define melting points. --- code/defines/obj/hydro.dm | 1 + code/defines/obj/weapon.dm | 13 ++++++++++++- code/game/gamemodes/nuclear/pinpointer.dm | 1 + code/game/machinery/alarm.dm | 2 ++ code/game/machinery/atmoalter/canister.dm | 1 + code/game/machinery/atmoalter/gas_mine.dm | 1 + code/game/machinery/camera/camera_assembly.dm | 1 + code/game/machinery/doors/airlock_electronics.dm | 1 + code/game/objects/items/devices/debugger.dm | 1 + code/game/objects/items/devices/flashlight.dm | 1 + code/game/objects/items/devices/multitool.dm | 1 + code/game/objects/items/devices/powersink.dm | 1 + code/game/objects/items/devices/radio/headset.dm | 1 + code/game/objects/items/devices/radio/intercom.dm | 3 ++- code/game/objects/items/devices/radio/radio.dm | 1 + code/game/objects/items/devices/scanners.dm | 3 +++ code/game/objects/items/devices/taperecorder.dm | 1 + code/game/objects/items/stacks/rods.dm | 1 + code/game/objects/items/stacks/sheets/glass.dm | 4 ++++ code/game/objects/items/stacks/sheets/mineral.dm | 7 +++++++ .../game/objects/items/stacks/sheets/sheet_types.dm | 4 ++++ code/game/objects/items/stacks/tiles/plasteel.dm | 1 + code/game/objects/items/toys.dm | 3 +++ code/game/objects/items/weapons/RCD.dm | 3 ++- code/game/objects/items/weapons/RPD.dm | 1 + .../objects/items/weapons/ai_modules/AI_modules.dm | 1 + code/game/objects/items/weapons/cash.dm | 1 + code/game/objects/items/weapons/extinguisher.dm | 1 + code/game/objects/items/weapons/flamethrower.dm | 1 + code/game/objects/items/weapons/handcuffs.dm | 1 + code/game/objects/items/weapons/kitchen.dm | 10 ++++++++++ code/game/objects/items/weapons/paint.dm | 1 + code/game/objects/items/weapons/power_cells.dm | 1 + code/game/objects/items/weapons/shields.dm | 5 +++-- code/game/objects/items/weapons/storage/toolbox.dm | 1 + code/game/objects/items/weapons/surgery_tools.dm | 1 + code/game/objects/items/weapons/tile_painter.dm | 1 + code/game/objects/items/weapons/tools.dm | 5 +++++ code/setup.dm | 9 +++++++-- 39 files changed, 90 insertions(+), 7 deletions(-) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 9d48dc9fe91..f8041ec49b4 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1530,6 +1530,7 @@ w_class = 2.0 m_amt = 50 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL attack_verb = list("slashed", "sliced", "cut", "clawed") // ************************************* diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 53c6b3cd3fa..7f74c83deac 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -102,7 +102,6 @@ throw_speed = 4 throw_range = 5 - /obj/item/weapon/cane name = "cane" desc = "A cane used by a true gentlemen. Or a clown." @@ -115,6 +114,7 @@ w_class = 2.0 m_amt = 50 w_type = RECYK_MISC + melt_temperature = MELTPOINT_STEEL attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") /obj/item/weapon/disk @@ -504,6 +504,7 @@ flags = FPRINT | TABLEPASS| CONDUCT m_amt = 3750 w_type = RECYK_METAL + melt_temperature=MELTPOINT_STEEL /obj/item/weapon/shard name = "shard" @@ -517,6 +518,7 @@ item_state = "shard-glassnew" g_amt = 3750 w_type = RECYK_GLASS + melt_temperature = MELTPOINT_GLASS attack_verb = list("stabbed", "slashed", "sliced", "cut") suicide_act(mob/user) @@ -552,6 +554,9 @@ icon = 'icons/obj/shards.dmi' icon_state = "shrapnellarge" desc = "A bunch of tiny bits of shattered metal." + m_amt=5 + w_type=RECYK_METAL + melt_temperature=MELTPOINT_STEEL /obj/item/weapon/shard/shrapnel/New() @@ -588,6 +593,7 @@ throw_range = 20 m_amt = 100 w_type = RECYK_ELECTRONIC + melt_temperature=MELTPOINT_SILICON origin_tech = "magnets=1" /obj/item/weapon/staff @@ -630,6 +636,7 @@ icon_state = "table_parts" m_amt = 3750 w_type = RECYK_METAL + melt_temperature=MELTPOINT_STEEL flags = FPRINT | TABLEPASS| CONDUCT attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked") @@ -644,6 +651,7 @@ icon_state = "reinf_tableparts" m_amt = 7500 w_type = RECYK_METAL + melt_temperature=MELTPOINT_STEEL flags = FPRINT | TABLEPASS| CONDUCT /obj/item/weapon/table_parts/wood @@ -665,6 +673,7 @@ var/old_lay = null m_amt = 40 w_type = RECYK_METAL + melt_temperature=MELTPOINT_STEEL attack_verb = list("whipped", "lashed", "disciplined", "tickled") suicide_act(mob/user) @@ -763,6 +772,7 @@ throw_range = 4 m_amt = 15000 w_type = RECYK_METAL + melt_temperature=MELTPOINT_STEEL origin_tech = "materials=2;combat=1" attack_verb = list("chopped", "torn", "cut") @@ -829,6 +839,7 @@ icon = 'icons/obj/stock_parts.dmi' w_class = 2.0 var/rating = 1 + melt_temperature=MELTPOINT_STEEL /obj/item/weapon/stock_parts/New() . = ..() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index aaf6501b5f9..acaa6473aa6 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -10,6 +10,7 @@ throw_range = 20 m_amt = 500 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL var/obj/item/weapon/disk/nuclear/the_disk = null var/active = 0 diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ce52ff2d313..724b5e9237e 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -927,6 +927,7 @@ Code shamelessly copied from apc_frame icon_state = "alarm_bitem" flags = FPRINT | TABLEPASS| CONDUCT m_amt = 2*CC_PER_SHEET_METAL + melt_temperature = MELTPOINT_STEEL w_type = RECYK_METAL /obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -1240,6 +1241,7 @@ Code shamelessly copied from apc_frame icon_state = "fire_bitem" flags = FPRINT | TABLEPASS| CONDUCT m_amt=2*CC_PER_SHEET_METAL + melt_temperature = MELTPOINT_STEEL w_type = RECYK_METAL /obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 19325579bfc..935afcaea5e 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -20,6 +20,7 @@ var/busy = 0 m_amt=10*CC_PER_SHEET_METAL w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "Canister: \[N2O\]" diff --git a/code/game/machinery/atmoalter/gas_mine.dm b/code/game/machinery/atmoalter/gas_mine.dm index 055c9eb0ade..e1072c7cad9 100644 --- a/code/game/machinery/atmoalter/gas_mine.dm +++ b/code/game/machinery/atmoalter/gas_mine.dm @@ -7,6 +7,7 @@ m_amt=10*CC_PER_SHEET_METAL w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL var/datum/gas_mixture/air_contents diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 8d2e8461887..9399b49fba0 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -9,6 +9,7 @@ m_amt = 700 g_amt = 300 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL // Motion, EMP-Proof, X-Ray var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 526f7329f01..a640344619f 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -8,6 +8,7 @@ m_amt = 50 g_amt = 50 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_SILICON req_access = list(access_engine) diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 59497cb0b64..a52a40dd782 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -19,6 +19,7 @@ m_amt = 50 g_amt = 20 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_SILICON origin_tech = "magnets=1;engineering=1" var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 272b42b348b..1b0cb85139b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -10,6 +10,7 @@ m_amt = 50 g_amt = 20 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL // Assuming big beefy fucking maglite. action_button_name = "Toggle Light" var/on = 0 var/brightness_on = 4 //luminosity when on diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index fdb7bcf28c2..418bd9ac194 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -18,6 +18,7 @@ m_amt = 50 g_amt = 20 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_SILICON origin_tech = "magnets=1;engineering=1" // VG: We dun changed dis so we can link simple machines. - N3X var/obj/machinery/buffer // simple machine buffer for device linkage diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index ee4d2bc352e..a1d164bf27c 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -12,6 +12,7 @@ throw_range = 2 m_amt = 750 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL origin_tech = "powerstorage=3;syndicate=5" var/drain_rate = 600000 // amount of power to drain per tick var/power_drained = 0 // has drained this much power diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index cee3d6ef5bc..73ad9a56fa8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -6,6 +6,7 @@ g_amt = 0 m_amt = 75 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_PLASTIC subspace_transmission = 1 canhear_range = 0 // can't hear headsets from very far away diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 508d1849f7c..d0c6a85816f 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -155,4 +155,5 @@ w_class = 2.0 m_amt = 50 g_amt = 50 - w_type = RECYK_ELECTRONIC \ No newline at end of file + w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_SILICON \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index e907f1d922d..a6418871e41 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -34,6 +34,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use g_amt = 25 m_amt = 75 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_PLASTIC var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio var/const/FREQ_LISTENING = 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 819e89c3688..f2c9f0d956e 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -19,6 +19,7 @@ REAGENT SCANNER item_state = "electronic" m_amt = 150 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_PLASTIC origin_tech = "magnets=1;engineering=1" /obj/item/device/t_scanner/Destroy() @@ -86,6 +87,7 @@ REAGENT SCANNER throw_range = 10 m_amt = 200 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_PLASTIC origin_tech = "magnets=1;biotech=1" var/mode = 1; @@ -239,6 +241,7 @@ REAGENT SCANNER m_amt = 30 g_amt = 20 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_PLASTIC origin_tech = "magnets=1;engineering=1" /obj/item/device/analyzer/attack_self(mob/user as mob) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 036546de661..ff631c70125 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -7,6 +7,7 @@ m_amt = 60 g_amt = 30 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_PLASTIC var/emagged = 0.0 var/recording = 0.0 var/playing = 0.0 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index c5fb1c0ada4..93e1d4823f2 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -13,6 +13,7 @@ max_amount = 60 attack_verb = list("hit", "bludgeoned", "whacked") w_type=RECYK_METAL + melt_temperature = MELTPOINT_STEEL /obj/item/stack/rods/recycle(var/datum/materials/rec) rec.addAmount("iron",amount/2) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 5bbcf6e96db..741fa177532 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -17,6 +17,7 @@ icon_state = "sheet-glass" g_amt = 3750 w_type = RECYK_GLASS + melt_temperature = MELTPOINT_GLASS origin_tech = "materials=1" var/created_window = /obj/structure/window/basic var/full_window = /obj/structure/window/full/basic @@ -126,6 +127,7 @@ g_amt = 3750 m_amt = 1875 w_type = RECYK_GLASS + melt_temperature = MELTPOINT_GLASS origin_tech = "materials=2" /obj/item/stack/sheet/rglass/cyborg @@ -325,6 +327,7 @@ origin_tech = "materials=3;plasmatech=2" created_window = /obj/structure/window/plasmabasic full_window = /obj/structure/window/full/plasmabasic + melt_temperature = MELTPOINT_STEEL+500 /obj/item/stack/sheet/glass/plasmaglass/recycle(var/datum/materials/rec) rec.addAmount("plasma",1*src.amount) @@ -361,6 +364,7 @@ g_amt=CC_PER_SHEET_GLASS m_amt = 1875 w_type = RECYK_GLASS + melt_temperature = MELTPOINT_STEEL+500 // I guess...? origin_tech = "materials=4;plasmatech=2" created_window = /obj/structure/window/plasmareinforced full_window = /obj/structure/window/full/plasmareinforced diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 2dacfc75224..b5974557d5d 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -29,6 +29,7 @@ Mineral Sheets throw_range = 5 origin_tech = "materials=1" sheettype = "sandstone" + melt_temperature = MELTPOINT_GLASS 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), \ @@ -59,6 +60,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ origin_tech = "materials=6" perunit = 3750 sheettype = "diamond" + melt_temperature = 3820 // In a vacuum, but fuck dat 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), \ @@ -88,6 +90,7 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ origin_tech = "materials=5" perunit = 2000 sheettype = "uranium" + melt_temperature = 1132+T0C 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), \ @@ -117,6 +120,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ origin_tech = "plasmatech=2;materials=2" perunit = 2000 sheettype = "plasma" + melt_temperature = MELTPOINT_STEEL+500 var/global/list/datum/stack_recipe/plasma_recipes = list ( \ new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ @@ -142,6 +146,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \ throw_range = 3 origin_tech = "materials=3" perunit = 2000 + melt_temperature = MELTPOINT_PLASTIC sheettype = "plastic" var/global/list/datum/stack_recipe/plastic_recipes = list ( \ @@ -177,6 +182,7 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \ throw_range = 3 origin_tech = "materials=4" perunit = 2000 + melt_temperature = 1064+T0C sheettype = "gold" var/global/list/datum/stack_recipe/gold_recipes = list ( \ @@ -207,6 +213,7 @@ var/global/list/datum/stack_recipe/phazon_recipes = list() item_state = "sheet-phazon" m_amt = 7500 w_type = RECYK_METAL + melt_temperature = MELTPOINT_PLASTIC throwforce = 15.0 flags = FPRINT | TABLEPASS | CONDUCT origin_tech = "materials=9" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a3f8544a2b6..1812d496431 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -87,6 +87,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ throwforce = 14.0 flags = FPRINT | TABLEPASS | CONDUCT origin_tech = "materials=1" + melt_temperature = MELTPOINT_STEEL /obj/item/stack/sheet/metal/recycle(var/datum/materials/rec) rec.addAmount("iron",1*amount) @@ -122,6 +123,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ flags = FPRINT | TABLEPASS | CONDUCT origin_tech = "materials=2" w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL+500 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null) recipes = plasteel_recipes @@ -153,6 +155,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ singular_name = "wood plank" icon_state = "sheet-wood" origin_tech = "materials=1;biotech=1" + autoignition_temperature=AUTOIGNITION_WOOD /obj/item/stack/sheet/wood/cultify() return @@ -210,6 +213,7 @@ var/global/list/datum/stack_recipe/charcoal_recipes = list () icon_state = "sheet-charcoal" flags = FPRINT | TABLEPASS origin_tech = "materials=1" + autoignition_temperature=AUTOIGNITION_WOOD /obj/item/stack/sheet/charcoal/New(var/loc, var/amount=null) recipes = charcoal_recipes diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index 705b01a3a76..019a543c646 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -7,6 +7,7 @@ force = 6.0 m_amt = 937.5 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL throwforce = 15.0 throw_speed = 5 throw_range = 20 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index c39bd01c7a8..c354cf3f55a 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -132,6 +132,7 @@ g_amt = 10 m_amt = 10 w_type = RECYK_MISC + melt_temperature = MELTPOINT_PLASTIC attack_verb = list("struck", "pistol whipped", "hit", "bashed") var/bullets = 7.0 @@ -188,6 +189,8 @@ w_class = 1.0 g_amt = 10 m_amt = 10 + melt_temperature = MELTPOINT_PLASTIC + w_type = RECYK_MISC var/amount_left = 7.0 update_icon() diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 196503726f7..ccb3a5888e4 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -20,6 +20,7 @@ RCD w_class = 3.0 m_amt = 50000 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL // Lots of metal origin_tech = "engineering=4;materials=2" var/datum/effect/effect/system/spark_spread/spark_system var/matter = 0 @@ -30,7 +31,7 @@ RCD suicide_act(mob/user) viewers(user) << "\red [user] is using the deconstruct function on the [src.name] on \himself! It looks like \he's trying to commit suicide!" - return (user.death(1)) + return (user.death(1)) New() desc = "A RCD. It currently holds [matter]/30 matter-units." diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 5dac8e343ab..03b5a12e023 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -138,6 +138,7 @@ var/global/list/RPD_recipes=list( m_amt = 75000 g_amt = 37500 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL origin_tech = "engineering=4;materials=2" var/datum/effect/effect/system/spark_spread/spark_system var/working = 0 diff --git a/code/game/objects/items/weapons/ai_modules/AI_modules.dm b/code/game/objects/items/weapons/ai_modules/AI_modules.dm index 45eb52e03f2..cb2e1057fc8 100644 --- a/code/game/objects/items/weapons/ai_modules/AI_modules.dm +++ b/code/game/objects/items/weapons/ai_modules/AI_modules.dm @@ -25,6 +25,7 @@ Refactored AI modules by N3X15 var/gold_amt=0 var/diamond_amt=0 w_type=RECYK_ELECTRONIC + melt_temperature = MELTPOINT_SILICON // Don't specify sulfuric, as that's renewable and is used up in the etching process anyway. var/law // Cached law diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 331e4ec5526..2efa81bd1b1 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -27,6 +27,7 @@ var/global/list/moneytypes=list( var/worth = 1 // Per chip var/amount = 1 // number of chips var/stack_color = "#4E054F" + autoignition_temperature=AUTOIGNITION_PAPER /obj/item/weapon/spacecash/New(var/new_loc,var/new_amount=1) . = ..(new_loc) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 3877bc2ed6f..79aedfd14e2 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -14,6 +14,7 @@ force = 10.0 m_amt = 90 // TODO: Check against autolathe. w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") var/max_water = 50 var/last_use = 1.0 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 72ab151a4b2..dcecec327a2 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -12,6 +12,7 @@ w_class = 3.0 m_amt = 500 w_type = RECYK_MISC + melt_temperature = MELTPOINT_STEEL origin_tech = "combat=1;plasmatech=1" var/status = 0 var/throw_amount = 100 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 69aba5dcf6c..f28a96254c2 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -12,6 +12,7 @@ throw_range = 5 m_amt = 500 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL origin_tech = "materials=1" var/dispenser = 0 var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 7c4bf39d855..e67d23de367 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -40,12 +40,14 @@ desc = "SPOON!" icon_state = "spoon" attack_verb = list("attacked", "poked") + melt_temperature = MELTPOINT_STEEL /obj/item/weapon/kitchen/utensil/pspoon name = "plastic spoon" desc = "Super dull action!" icon_state = "pspoon" attack_verb = list("attacked", "poked") + melt_temperature = MELTPOINT_STEEL /* * Forks @@ -54,6 +56,7 @@ name = "fork" desc = "Pointy." icon_state = "fork" + melt_temperature = MELTPOINT_STEEL /obj/item/weapon/kitchen/utensil/fork/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M)) @@ -82,6 +85,7 @@ name = "plastic fork" desc = "Yay, no washing up to do." icon_state = "pfork" + melt_temperature = MELTPOINT_PLASTIC /obj/item/weapon/kitchen/utensil/pfork/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M)) @@ -115,6 +119,7 @@ icon_state = "knife" force = 10.0 throwforce = 10.0 + melt_temperature = MELTPOINT_STEEL suicide_act(mob/user) viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ @@ -136,6 +141,7 @@ icon_state = "pknife" force = 10.0 throwforce = 10.0 + melt_temperature = MELTPOINT_PLASTIC /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) @@ -161,6 +167,7 @@ throw_range = 6 m_amt = 12000 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL origin_tech = "materials=1" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -193,6 +200,7 @@ throw_range = 6 m_amt = 12000 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL origin_tech = "materials=1" attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -230,6 +238,7 @@ throw_speed = 2 throw_range = 7 w_class = 3.0 + autoignition_temperature=AUTOIGNITION_WOOD attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. /obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) @@ -285,6 +294,7 @@ flags = FPRINT | TABLEPASS | CONDUCT m_amt = 3000 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL var/list/carrying = list() // List of things on the tray. - Doohl var/max_carry = 10 // w_class = 1 -- takes up 1 // w_class = 2 -- takes up 3 diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 47b4542b071..4ba3d50cddd 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -12,6 +12,7 @@ var/global/list/cached_icons = list() g_amt = 0 w_type = RECYK_METAL w_class = 3.0 + melt_temperature = MELTPOINT_STEEL amount_per_transfer_from_this = 10 possible_transfer_amounts = list(10,20,30,50,70) volume = 70 diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index f1033c14534..251787031b9 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -16,6 +16,7 @@ m_amt = 700 g_amt = 50 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL // Rugged var/rigged = 0 // true if rigged to explode var/minor_fault = 0 //If not 100% reliable, it will build up faults. var/construction_cost = list("metal"=750,"glass"=75) diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index a0a86f6210e..f6d747b6640 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -15,6 +15,7 @@ w_class = 4.0 g_amt = 7500 m_amt = 1000 + melt_temperature = MELTPOINT_GLASS origin_tech = "materials=2" attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time @@ -34,7 +35,7 @@ cooldown = world.time else ..() - + /obj/item/weapon/shield/riot/roman name = "roman shield" desc = "Bears an inscription on the inside: \"Romanes venio domus\"." @@ -68,7 +69,7 @@ origin_tech = "materials=4;magnets=3;syndicate=4" attack_verb = list("shoved", "bashed") var/active = 0 - + suicide_act(mob/user) viewers(user) << "\red [user] is putting the [src.name] to their head and activating it! It looks like \he's trying to commit suicide!" return (BRUTELOSS) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index def6786fb74..e7a7170a6ea 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -12,6 +12,7 @@ m_amt = 5000 w_type = RECYK_METAL w_class = 4.0 + melt_temperature = MELTPOINT_STEEL origin_tech = "combat=1" attack_verb = list("robusted") diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 57a9f29852e..b6571711986 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -18,6 +18,7 @@ icon_state = "retractor" m_amt = 10000 g_amt = 5000 // OH COME ON, WHERE THE FUCK IS THERE ANY GLASS IN A GODDAMN RETRACTOR + melt_temperature = MELTPOINT_STEEL w_type = RECYK_METAL flags = FPRINT | TABLEPASS | CONDUCT w_class = 1.0 diff --git a/code/game/objects/items/weapons/tile_painter.dm b/code/game/objects/items/weapons/tile_painter.dm index 1fd658f9e35..89a50246ee0 100644 --- a/code/game/objects/items/weapons/tile_painter.dm +++ b/code/game/objects/items/weapons/tile_painter.dm @@ -312,6 +312,7 @@ var/global/list/paint_variants = list( m_amt = 15000 g_amt = 7500 w_type = RECYK_ELECTRONIC + melt_temperature = MELTPOINT_STEEL origin_tech = "engineering=2;materials=1" var/working = 0 var/datum/paint_info/selected diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 1a56db37cc3..5d1a9caf13d 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -28,6 +28,7 @@ w_class = 2.0 m_amt = 150 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL origin_tech = "materials=1;engineering=1" attack_verb = list("bashed", "battered", "bludgeoned", "whacked") @@ -51,6 +52,7 @@ g_amt = 0 m_amt = 75 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL attack_verb = list("stabbed") suicide_act(mob/user) @@ -133,6 +135,7 @@ w_class = 2.0 m_amt = 80 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL origin_tech = "materials=1;engineering=1" attack_verb = list("pinched", "nipped") @@ -177,6 +180,7 @@ m_amt = 70 g_amt = 30 w_type = RECYK_MISC + melt_temperature = MELTPOINT_PLASTIC //R&D tech level origin_tech = "engineering=1" @@ -480,6 +484,7 @@ w_class = 2.0 m_amt = 50 w_type = RECYK_METAL + melt_temperature = MELTPOINT_STEEL origin_tech = "engineering=1" attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") diff --git a/code/setup.dm b/code/setup.dm index a65b2885aa8..40f2927839c 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -883,6 +883,11 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define AUTOIGNITION_WOOD 573.15 #define AUTOIGNITION_PAPER 519.15 +#define MELTPOINT_GLASS 1500+T0C +#define MELTPOINT_STEEL 1510+T0C +#define MELTPOINT_SILICON 1687 // KELVIN +#define MELTPOINT_PLASTIC 180+T0C + //////////////////////// //// MACHINE FLAGS ///// //////////////////////// @@ -897,7 +902,7 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse ///////////////////////// //gun shit - prepare to have various things added to this -#define SILENCECOMP 1 //Silencer-compatible -#define AUTOMAGDROP 2 //Does the mag drop when it's empty? +#define SILENCECOMP 1 //Silencer-compatible +#define AUTOMAGDROP 2 //Does the mag drop when it's empty? #define EMPTYCASINGS 4 //Does the gun eject empty casings?