From 72e45ebf7bfbdee01a8070d690023c3e80185f7c Mon Sep 17 00:00:00 2001 From: Graham Lloyd Date: Thu, 3 Apr 2014 17:54:06 -0400 Subject: [PATCH] A first pass at more realistic w_class values --- code/WorkInProgress/Ported/policetape.dm | 2 +- code/WorkInProgress/autopsy.dm | 2 +- code/defines/obj.dm | 2 +- code/defines/obj/hydro.dm | 10 +++++----- code/defines/obj/weapon.dm | 18 +++++++++--------- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/machinery/cloning.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 6 +++--- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/devices/megaphone.dm | 2 +- code/game/objects/items/devices/scanners.dm | 2 +- .../game/objects/items/devices/taperecorder.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/weapons/shields.dm | 2 +- .../game/objects/items/weapons/storage/bags.dm | 4 ++-- code/game/objects/items/weapons/weaponry.dm | 4 ++-- code/game/objects/structures/bedsheet_bin.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 2 +- code/modules/customitems/item_defines.dm | 12 ++++++------ code/modules/detectivework/evidence.dm | 2 +- code/modules/economy/cash.dm | 2 +- code/modules/library/lib_items.dm | 2 +- .../mob/living/carbon/brain/brain_item.dm | 2 +- .../mob/living/silicon/robot/component.dm | 2 +- code/modules/paperwork/photography.dm | 2 +- code/modules/power/lighting.dm | 2 +- code/modules/projectiles/ammunition.dm | 2 +- code/modules/reagents/reagent_containers.dm | 2 +- .../reagents/reagent_containers/dropper.dm | 1 + .../reagents/reagent_containers/pill.dm | 1 + .../reagents/reagent_containers/syringes.dm | 1 + code/modules/recycling/sortingmachinery.dm | 2 +- code/modules/research/designs.dm | 2 +- code/modules/research/research.dm | 2 +- .../research/xenoarchaeology/chemistry.dm | 2 +- .../xenoarchaeology/tools/tools_anoscanner.dm | 2 +- .../tools/tools_depthscanner.dm | 2 +- code/modules/telesci/bscrystal.dm | 2 +- 40 files changed, 61 insertions(+), 58 deletions(-) diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 58ad2f8eb6..cdd547d7c0 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -4,7 +4,7 @@ icon = 'icons/policetape.dmi' icon_state = "rollstart" flags = FPRINT - w_class = 1.0 + w_class = 2.0 var/turf/start var/turf/end var/tape_type = /obj/item/tape diff --git a/code/WorkInProgress/autopsy.dm b/code/WorkInProgress/autopsy.dm index 280c40d807..9c812ef7ae 100644 --- a/code/WorkInProgress/autopsy.dm +++ b/code/WorkInProgress/autopsy.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/autopsy_scanner.dmi' icon_state = "" flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 + w_class = 2.0 origin_tech = "materials=1;biotech=1" var/list/datum/autopsy_data_scanner/wdata = list() var/list/datum/autopsy_data_scanner/chemtraces = list() diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 197e3433d7..25a5242c07 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -297,7 +297,7 @@ var/global/list/PDA_Manifest = list() item_state = "beachball" density = 0 anchored = 0 - w_class = 1.0 + w_class = 2.0 force = 0.0 throwforce = 0.0 throw_speed = 1 diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 2b57dbeffa..9357b7f308 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -18,7 +18,7 @@ icon = 'icons/obj/seeds.dmi' icon_state = "seed" // unknown plant seed - these shouldn't exist in-game flags = FPRINT | TABLEPASS - w_class = 1.0 // Makes them pocketable + w_class = 2.0 // Makes them pocketable var/mypath = "/obj/item/seeds" var/plantname = "Plants" var/productname = "" @@ -1205,7 +1205,7 @@ force = 0 flags = TABLEPASS throwforce = 1 - w_class = 1.0 + w_class = 2.0 throw_speed = 1 throw_range = 3 plant_type = 1 @@ -1229,7 +1229,7 @@ force = 15 flags = TABLEPASS throwforce = 1 - w_class = 1.0 + w_class = 2.0 throw_speed = 1 throw_range = 3 plant_type = 1 @@ -1251,7 +1251,7 @@ force = 30 flags = TABLEPASS throwforce = 1 - w_class = 1.0 + w_class = 2.0 throw_speed = 1 throw_range = 3 plant_type = 1 @@ -1417,7 +1417,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" flags = FPRINT | TABLEPASS - w_class = 1.0 + w_class = 2.0 var/mutmod = 0 var/yieldmod = 0 New() diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 4e7beba1dd..7ca5bdbe80 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -31,7 +31,7 @@ icon = 'icons/obj/items.dmi' icon_state = "banana_peel" item_state = "banana_peel" - w_class = 1.0 + w_class = 2.0 throwforce = 0 throw_speed = 4 throw_range = 20 @@ -42,7 +42,7 @@ icon = 'icons/obj/harvest.dmi' icon_state = "corncob" item_state = "corncob" - w_class = 1.0 + w_class = 2.0 throwforce = 0 throw_speed = 4 throw_range = 20 @@ -53,7 +53,7 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "soap" - w_class = 1.0 + w_class = 2.0 throwforce = 0 throw_speed = 4 throw_range = 20 @@ -90,7 +90,7 @@ icon = 'icons/obj/items.dmi' icon_state = "c_tube" throwforce = 1 - w_class = 1.0 + w_class = 2.0 throw_speed = 4 throw_range = 5 @@ -117,7 +117,7 @@ desc = "Better keep this safe." icon_state = "nucleardisk" item_state = "card-id" - w_class = 1.0 + w_class = 2.0 /* /obj/item/weapon/game_kit @@ -229,7 +229,7 @@ icon_state = "large" sharp = 1 desc = "Could probably be used as ... a throwing weapon?" - w_class = 1.0 + w_class = 2.0 force = 5.0 throwforce = 8.0 item_state = "shard-glass" @@ -400,8 +400,8 @@ /obj/item/weapon/module/power_control name = "power control module" icon_state = "power_mod" - desc = "Heavy-duty switching circuits for power control." - m_amt = 50 + desc = "Heavy-duty switching circuits for power control." + m_amt = 50 g_amt = 50 /obj/item/weapon/module/id_auth @@ -461,7 +461,7 @@ icon = 'icons/obj/food.dmi' icon_state = "meat" flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 + w_class = 2.0 origin_tech = "biotech=2" /obj/item/weapon/hatchet diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index ff19ce7764..cd70a392de 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -5,7 +5,7 @@ icon_state ="book" throw_speed = 1 throw_range = 5 - w_class = 1.0 + w_class = 2.0 flags = FPRINT | TABLEPASS var/uses = 5 var/temp = null diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 6bd2fb6a6f..15d0b2d61c 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -29,7 +29,7 @@ icon = 'icons/obj/cloning.dmi' icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. item_state = "card-id" - w_class = 1.0 + w_class = 2.0 var/datum/dna2/record/buf=null var/read_only = 0 //Well,it's still a floppy disk diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7f954721d4..3a10e94f3c 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon = 'icons/obj/pda.dmi' icon_state = "pda" item_state = "electronic" - w_class = 1.0 + w_class = 2.0 flags = FPRINT | TABLEPASS slot_flags = SLOT_ID | SLOT_BELT @@ -338,7 +338,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return lastmode = mode - + var/title = "Personal Data Assistant" var/data[0] // This is the data that will be sent to the PDA @@ -367,7 +367,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(mode in cartmodes) data["records"] = cartridge.create_NanoUI_values() - if(mode == 0) + if(mode == 0) cartdata["name"] = cartridge.name cartdata["access"] = list(\ "access_security" = cartridge.access_security,\ diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 2adadfd94b..152aa2fa34 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -4,7 +4,7 @@ icon_state = "flash" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) throwforce = 5 - w_class = 1.0 + w_class = 2.0 throw_speed = 4 throw_range = 10 flags = FPRINT | TABLEPASS| CONDUCT diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index ec8075e85b..371fe3b8c4 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -3,7 +3,7 @@ desc = "A device used to project your voice. Loudly." icon_state = "megaphone" item_state = "radio" - w_class = 1.0 + w_class = 2.0 flags = FPRINT | TABLEPASS | CONDUCT var/spamcheck = 0 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 7e616a8f35..d3f7523988 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -68,7 +68,7 @@ REAGENT SCANNER flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT throwforce = 3 - w_class = 1.0 + w_class = 2.0 throw_speed = 5 throw_range = 10 m_amt = 200 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 555dbe1cae..188787f83b 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -3,7 +3,7 @@ name = "universal recorder" icon_state = "taperecorderidle" item_state = "analyzer" - w_class = 1.0 + w_class = 2.0 m_amt = 60 g_amt = 30 var/emagged = 0.0 diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 6e1c608cb2..5ad758015e 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -5,7 +5,7 @@ item_state = "lgloves" force = 0 throwforce = 0 - w_class = 1.0 + w_class = 2.0 throw_speed = 1 throw_range = 15 var/state diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 47175e20d1..868e2d4b8d 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/items.dmi' amount = 5 max_amount = 5 - w_class = 1 + w_class = 2 throw_speed = 4 throw_range = 20 var/heal_brute = 0 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9b955195db..756812ccb1 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -4,7 +4,7 @@ //Added by Jack Rost /obj/item/trash icon = 'icons/obj/trash.dmi' - w_class = 1.0 + w_class = 2.0 desc = "This is rubbish." raisins name = "4no raisins" diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 30d199cf97..21a4650f35 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -41,7 +41,7 @@ throwforce = 5.0 throw_speed = 1 throw_range = 4 - w_class = 1 + w_class = 2 origin_tech = "materials=4;magnets=3;syndicate=4" attack_verb = list("shoved", "bashed") var/active = 0 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 2219619720..f7da60688e 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -94,7 +94,7 @@ storage_slots = 50; //the number of plant pieces it can carry. max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class max_w_class = 3 - w_class = 1 + w_class = 2 can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown") @@ -252,5 +252,5 @@ storage_slots = 50; //the number of cash pieces it can carry. max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * cash.w_class max_w_class = 3 - w_class = 1 + w_class = 2 can_hold = list("/obj/item/weapon/coin","/obj/item/weapon/spacecash") diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 922d926376..77a9d1267b 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -6,7 +6,7 @@ flags = FPRINT | TABLEPASS slot_flags = SLOT_BELT throwforce = 0 - w_class = 1.0 + w_class = 2.0 throw_speed = 7 throw_range = 15 attack_verb = list("banned") @@ -26,7 +26,7 @@ throw_speed = 1 throw_range = 4 throwforce = 10 - w_class = 1 + w_class = 2 suicide_act(mob/user) viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 4ea23ec085..8e47b6479c 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -14,7 +14,7 @@ LINEN BINS throwforce = 1 throw_speed = 1 throw_range = 2 - w_class = 1.0 + w_class = 2.0 item_color = "white" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 385249e925..57420bbfe0 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -21,7 +21,7 @@ desc = "A sterile mask designed to help prevent the spread of diseases." icon_state = "sterile" item_state = "sterile" - w_class = 1 + w_class = 2 flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 7b18520f3a..f5de6d76f6 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -762,7 +762,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "mara_kilpatrick_1" flags = FPRINT|TABLEPASS - w_class = 1 + w_class = 2 ////// Small locket - Altair An-Nasaqan - Serithi @@ -775,7 +775,7 @@ item_color = "altair_locket" slot_flags = 0 flags = FPRINT|TABLEPASS - w_class = 1 + w_class = 2 slot_flags = SLOT_MASK ////// Silver locket - Konaa Hirano - Konaa_Hirano @@ -789,7 +789,7 @@ item_color = "konaahirano" slot_flags = 0 flags = FPRINT|TABLEPASS - w_class = 1 + w_class = 2 slot_flags = SLOT_MASK var/obj/item/held //Item inside locket. @@ -819,7 +819,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "nasir_khayyam_1" flags = FPRINT|TABLEPASS - w_class = 1 + w_class = 2 slot_flags = SLOT_MASK ////// Emerald necklace - Ty Foster - Nega @@ -830,7 +830,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "ty_foster" flags = FPRINT|TABLEPASS - w_class = 1 + w_class = 2 ////// Apollon Pendant - Michael Guess - Dragor23 /obj/item/clothing/mask/michael_guess_1 @@ -839,7 +839,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "michael_guess_1" flags = FPRINT|TABLEPASS - w_class = 1 + w_class = 2 slot_flags = SLOT_MASK //////////// Shoes //////////// diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 0c41441781..7148a5afed 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "evidenceobj" item_state = "" - w_class = 1 + w_class = 2 /obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user as mob, proximity) if(!proximity) return diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 356015c6c0..481f9f8b42 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -11,7 +11,7 @@ throwforce = 1.0 throw_speed = 1 throw_range = 2 - w_class = 1.0 + w_class = 2.0 var/access = list() access = access_crate_cash var/worth = 0 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 3c045350aa..26de93122b 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -247,7 +247,7 @@ icon_state ="scanner" throw_speed = 1 throw_range = 5 - w_class = 1.0 + w_class = 2.0 flags = FPRINT | TABLEPASS var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this var/obj/item/weapon/book/book // Currently scanned book diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 93f56618a0..5e94ea9bc9 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -5,7 +5,7 @@ icon_state = "brain2" flags = TABLEPASS force = 1.0 - w_class = 1.0 + w_class = 2.0 throwforce = 1.0 throw_speed = 3 throw_range = 5 diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 1e23637b56..60096d0330 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -164,7 +164,7 @@ flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT throwforce = 3 - w_class = 1.0 + w_class = 2.0 throw_speed = 5 throw_range = 10 m_amt = 200 diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index f050a42822..a76b8de25d 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -26,7 +26,7 @@ icon = 'icons/obj/items.dmi' icon_state = "photo" item_state = "paper" - w_class = 1.0 + w_class = 2.0 var/icon/img //Big photo image var/scribble //Scribble on the back. diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index f1fa25234a..dd6d971dc4 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -642,7 +642,7 @@ flags = FPRINT | TABLEPASS force = 2 throwforce = 5 - w_class = 1 + w_class = 2 var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN var/base_state var/switchcount = 0 // number of times switched diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index ecb7df50cc..7368735b49 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -53,7 +53,7 @@ item_state = "syringe_kit" m_amt = 50000 throwforce = 2 - w_class = 1.0 + w_class = 2.0 throw_speed = 4 throw_range = 10 var/list/stored_ammo = list() diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 0828e545fc..401d98b7ef 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -3,7 +3,7 @@ desc = "..." icon = 'icons/obj/chemical.dmi' icon_state = null - w_class = 1 + w_class = 2 var/amount_per_transfer_from_this = 5 var/possible_transfer_amounts = list(5,10,15,25,30) var/volume = 30 diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 17f8d1ce11..11fd71e620 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -8,6 +8,7 @@ icon_state = "dropper0" amount_per_transfer_from_this = 5 possible_transfer_amounts = list(1,2,3,4,5) + w_class = 1 volume = 5 var/filled = 0 diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 0500a5d79b..fa9149f3ff 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -8,6 +8,7 @@ icon_state = null item_state = "pill" possible_transfer_amounts = null + w_class = 1 volume = 50 New() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 2f345463e8..72275227e3 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -15,6 +15,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = null //list(5,10,15) volume = 15 + w_class = 1 var/mode = SYRINGE_DRAW on_reagent_change() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 28dad70da2..eecba616fb 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -165,7 +165,7 @@ //If you don't want to fuck up disposals, add to this list, and don't change the order. //If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete - w_class = 1 + w_class = 2 item_state = "electronic" flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 7e64e0cea5..de35439332 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1712,7 +1712,7 @@ datum/design/security_hud icon = 'icons/obj/cloning.dmi' icon_state = "datadisk2" item_state = "card-id" - w_class = 1.0 + w_class = 2.0 m_amt = 30 g_amt = 10 var/datum/design/blueprint diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 40b534bf0e..1ec9093cfc 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -262,7 +262,7 @@ datum/tech/robotics icon = 'icons/obj/cloning.dmi' icon_state = "datadisk2" item_state = "card-id" - w_class = 1.0 + w_class = 2.0 m_amt = 30 g_amt = 10 var/datum/tech/stored diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm index 9e0e646234..13a8367b96 100644 --- a/code/modules/research/xenoarchaeology/chemistry.dm +++ b/code/modules/research/xenoarchaeology/chemistry.dm @@ -77,7 +77,7 @@ datum icon_state = "solution_tray" m_amt = 0 g_amt = 5 - w_class = 1.0 + w_class = 2.0 amount_per_transfer_from_this = 1 possible_transfer_amounts = list(1, 2) volume = 2 diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm index f3b1f9583e..257c7389cc 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "flashgun" item_state = "lampgreen" - w_class = 1.0 + w_class = 2.0 flags = FPRINT | TABLEPASS slot_flags = SLOT_BELT var/nearest_artifact_id = "unknown" diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index ad9a525b71..9f48c7d6a7 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -9,7 +9,7 @@ icon = 'icons/obj/pda.dmi' icon_state = "crap" item_state = "analyzer" - w_class = 1.0 + w_class = 2.0 flags = FPRINT | TABLEPASS slot_flags = SLOT_BELT var/list/positive_locations = list() diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index d9e968f4da..1b3f88cf08 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -5,7 +5,7 @@ desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate." icon = 'icons/obj/telescience.dmi' icon_state = "bluespace_crystal" - w_class = 1 + w_class = 2 origin_tech = "bluespace=4;materials=3" var/blink_range = 8 // The teleport range when crushed/thrown at someone.