diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 883265896fe5..f185cdb43a81 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -578,7 +578,7 @@ RLD icon = 'icons/obj/ammunition/ammo.dmi' icon_state = "rcd" item_state = "rcdammo" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_NORMAL lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' custom_materials = list(/datum/material/iron=12000, /datum/material/glass=8000) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 70871e2ddc77..99473661dd5e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(PDAs) lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' item_flags = NOBLUDGEON - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT actions_types = list(/datum/action/item_action/toggle_light) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index 8986f8443698..b67b4bb3f707 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -4,7 +4,7 @@ desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction." icon = 'icons/obj/module.dmi' icon_state = "boris" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 300) var/recharging = FALSE var/circuits = 5 //How many circuits the pseudocircuit has left diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 0606e999b1ce..9dd5d80d78bf 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -170,6 +170,7 @@ icon_state = "penlight" item_state = "" flags_1 = CONDUCT_1 + w_class = WEIGHT_CLASS_TINY light_range = 2 light_color = "#FFDDCC" light_power = 0.3 diff --git a/code/game/objects/items/devices/polycircuit.dm b/code/game/objects/items/devices/polycircuit.dm index be41de2c8411..def5d876d11b 100644 --- a/code/game/objects/items/devices/polycircuit.dm +++ b/code/game/objects/items/devices/polycircuit.dm @@ -4,7 +4,7 @@ desc = "A dense, overdesigned cluster of electronics which attempted to function as a multipurpose circuit electronic. Circuits can be removed from it... if you don't bleed out in the process." icon_state = "circuit_mess" item_state = "rods" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_NORMAL max_amount = 8 var/circuit_type = /obj/item/electronics/airlock var/chosen_circuit = "airlock" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 1caf2861a448..822901de7e27 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -16,34 +16,54 @@ throw_speed = 3 throw_range = 7 w_class = WEIGHT_CLASS_SMALL - custom_materials = list(/datum/material/iron=75, /datum/material/glass=25) + custom_materials = list(/datum/material/iron = 75, /datum/material/glass = 25) + slot_flags = ITEM_SLOT_NECK //Allows to be worn on neck so it's not eating pocket slots. obj_flags = USES_TGUI var/on = TRUE var/frequency = FREQ_COMMON - var/canhear_range = 3 // The range around the radio in which mobs can hear what it receives. - var/emped = 0 // Tracks the number of EMPs currently stacked. - var/headset = FALSE // It can be used for hotkeys - var/last_chatter_time // The time since we last played a radio chatter sound. (WS edit - Radio Chatter #434) - - var/broadcasting = FALSE // Whether the radio will transmit dialogue it hears nearby. - var/listening = FALSE // Whether the radio is currently receiving. - var/prison_radio = FALSE // If true, the transmit wire starts cut. - var/unscrewed = FALSE // Whether wires are accessible. Toggleable by screwdrivering. - var/freerange = FALSE // If true, the radio has access to the full spectrum. - var/subspace_transmission = FALSE // If true, the radio transmits and receives on subspace exclusively. - var/subspace_switchable = FALSE // If true, subspace_transmission can be toggled at will. - var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios. - var/use_command = FALSE // If true, broadcasts will be large and BOLD. - var/command = FALSE // If true, use_command can be toggled at will. - var/log = FALSE // If true, the UI will display the voice log for the frequency - var/list/loglist = list() //the voice log - - // Encryption key handling + ///The range around the radio in which mobs can hear what it receives. + var/canhear_range = 3 + ///Tracks the number of EMPs currently stacked. + var/emped = 0 + ///It can be used for hotkeys + var/headset = FALSE + ///The time since we last played a radio chatter sound. + var/last_chatter_time + + ///Whether the radio will transmit dialogue it hears nearby. + var/broadcasting = FALSE + ///Whether the radio is currently receiving. + var/listening = FALSE + ///If true, the transmit wire starts cut. + var/prison_radio = FALSE + ///Whether wires are accessible. Toggleable by screwdrivering. + var/unscrewed = FALSE + ///If true, the radio has access to the full spectrum. + var/freerange = FALSE + ///If true, the radio transmits and receives on subspace exclusively. + var/subspace_transmission = FALSE + ///If true, subspace_transmission can be toggled at will. + var/subspace_switchable = FALSE + ///Frequency lock to stop the user from untuning specialist radios. + var/freqlock = FALSE + ///If true, broadcasts will be large and BOLD. + var/use_command = FALSE + ///If true, use_command can be toggled at will. + var/command = FALSE + ///If true, the UI will display the voice log for the frequency + var/log = FALSE + ///the voice log + var/list/loglist = list() + + ///Encryption key handling var/obj/item/encryptionkey/keyslot - var/translate_binary = FALSE // If true, can hear the special binary channel. - var/independent = FALSE // If true, can say/hear on the special CentCom channel. - var/list/channels = list() // Map from name (see communications.dm) to on/off. First entry is current department (:h) + ///If true, can hear the special binary channel. + var/translate_binary = FALSE + ///If true, can say/hear on the special CentCom channel. + var/independent = FALSE + ///Map from name (see communications.dm) to on/off. First entry is current department (:h) + var/list/channels = list() var/list/secure_radio_connections var/const/FREQ_LISTENING = 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index a5afddd47483..e273aceed473 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -87,7 +87,7 @@ GENE SCANNER item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT throwforce = 3 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 7 custom_materials = list(/datum/material/iron=200) @@ -802,7 +802,7 @@ GENE SCANNER item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT throwforce = 3 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 7 custom_materials = list(/datum/material/iron=200) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 6e2f7e4c44d1..f2c63be37e64 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -318,7 +318,7 @@ item_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=20, /datum/material/glass=5) force = 1 throwforce = 0 diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index c58d4223ca3c..a0bd46148358 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -5,7 +5,7 @@ icon_state = "docs_generic" item_state = "paper" throwforce = 0 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_NORMAL throw_range = 1 throw_speed = 1 layer = MOB_LAYER diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index bac0935782e7..8335a2d82737 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -4,16 +4,16 @@ icon = 'icons/obj/stack_objects.dmi' amount = 6 max_amount = 6 - w_class = WEIGHT_CLASS_TINY - full_w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL + full_w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 7 resistance_flags = FLAMMABLE max_integrity = 40 novariants = FALSE item_flags = NOBLUDGEON - var/splint_fracture = FALSE //WS Edit- Splints - var/failure_chance //WS Edit - Failure chance + var/splint_fracture = FALSE + var/failure_chance var/self_delay = 50 var/other_delay = 0 var/repeating = FALSE diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 833360f52fa8..88ac0c90d95c 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ name = "empty sandbag" desc = "A bag to be filled with sand." icon_state = "sandbag" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL /obj/item/emptysandbag/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/ore/glass)) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index bac896c0b8d5..5cc98e8c6092 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -108,7 +108,7 @@ return var/static/items_inside = list( /obj/item/healthanalyzer = 1, - /obj/item/stack/medical/gauze = 1, + /obj/item/stack/medical/gauze/twelve = 1, /obj/item/stack/medical/suture = 2, /obj/item/stack/medical/mesh = 2, /obj/item/reagent_containers/hypospray/medipen = 1, diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 01d0a273f74a..84601407f649 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -247,7 +247,7 @@ desc = "Make sure to recyle the box in an autolathe when it gets empty." icon = 'icons/obj/ammunition/ammo.dmi' icon_state = "357OLD-7" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_NORMAL custom_materials = list(/datum/material/iron=10, /datum/material/glass=10) var/amount_left = 7 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 5b140a5b2428..19aabed49946 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -17,7 +17,7 @@ LINEN BINS throwforce = 0 throw_speed = 1 throw_range = 2 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE dying_key = DYE_REGISTRY_BEDSHEET greyscale_icon_state = "bedsheet" diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 6db5f18e31b9..33a4a6dc7d63 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -214,7 +214,6 @@ exposed = !exposed return TRUE - /obj/item/reagent_containers/food/snacks/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the people's pipes from the people's pee. Edibility is suggested to be low." diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 8fe788f79ca7..47605eb63d5a 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -7,7 +7,7 @@ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' throwforce = 0 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 300) light_system = MOVABLE_LIGHT //Used as a flash here. light_range = FLASH_LIGHT_RANGE diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm index 229924eee7ba..42fc90d0cc15 100644 --- a/code/modules/fishing/aquarium/aquarium_kit.dm +++ b/code/modules/fishing/aquarium/aquarium_kit.dm @@ -4,7 +4,7 @@ desc = "Autogenerates nutritious fish feed based on sample inside." icon = 'icons/obj/aquarium.dmi' icon_state = "fish_feed" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL /obj/item/fish_feed/Initialize(mapload) . = ..() @@ -32,13 +32,12 @@ desc = "Everything you need to build your own aquarium. Raw materials sold separately." icon = 'icons/obj/aquarium.dmi' icon_state = "construction_kit" - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL /obj/item/aquarium_kit/attack_self(mob/user) . = ..() to_chat(user,span_notice("There's instruction and tools necessary to build aquarium inside. All you need is to start crafting.")) - /obj/item/aquarium_prop name = "generic aquarium prop" desc = "very boring" diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 6d56533e9953..5f0e38920cc9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -7,7 +7,7 @@ item_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT custom_materials = list(/datum/material/iron=30, /datum/material/glass=20) var/scan_mode = PLANT_SCANMODE_STATS diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index 801263da009c..98c5c15e0e29 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/chemical/medicine.dmi' icon_state = "bottle19" desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely." - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_NORMAL custom_price = 400 /obj/item/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user, proximity) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index d8a9ecf90cad..5489b44aeb0f 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -105,7 +105,6 @@ icon_state = "mining_voucher" w_class = WEIGHT_CLASS_TINY - ///Conscript kit /obj/item/storage/backpack/duffelbag/mining_conscript diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm index 2c59adaaa2d0..41f5d4f9056d 100644 --- a/code/modules/projectiles/guns/ballistic/assault.dm +++ b/code/modules/projectiles/guns/ballistic/assault.dm @@ -1,5 +1,6 @@ /obj/item/gun/ballistic/automatic/assault show_magazine_on_sprite = TRUE + w_class = WEIGHT_CLASS_BULKY gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO) default_firemode = FIREMODE_SEMIAUTO @@ -40,7 +41,6 @@ show_magazine_on_sprite = TRUE unique_mag_sprites_for_variants = TRUE weapon_weight = WEAPON_MEDIUM - w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK manufacturer = MANUFACTURER_IMPORT default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40 @@ -109,7 +109,6 @@ fire_select_icon_state_prefix = "swisschesse_" - w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK default_ammo_type = /obj/item/ammo_box/magazine/swiss allowed_ammo_types = list( @@ -146,7 +145,6 @@ default_firemode = FIREMODE_OTHER weapon_weight = WEAPON_MEDIUM - w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK show_magazine_on_sprite = TRUE diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 15db3abb296e..fd893e432f30 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -1,6 +1,6 @@ /obj/item/gun/ballistic/automatic - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY gun_firemodes = list(FIREMODE_SEMIAUTO) default_firemode = FIREMODE_SEMIAUTO diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index d7d275986a87..dd483aa4965e 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -1,5 +1,6 @@ /obj/item/gun/ballistic/automatic/pistol bolt_type = BOLT_TYPE_LOCKING + w_class = WEIGHT_CLASS_NORMAL vary_fire_sound = FALSE fire_sound_volume = 90 diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 8d379b852b8f..264b792811c9 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -13,6 +13,7 @@ dual_wield_spread = 60 wield_slowdown = LASER_RIFLE_SLOWDOWN manufacturer = MANUFACTURER_SHARPLITE_NEW + w_class = WEIGHT_CLASS_BULKY /obj/item/gun/energy/e_gun/empty_cell spawn_no_ammo = TRUE @@ -49,7 +50,6 @@ default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded weapon_weight = WEAPON_MEDIUM - w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO) @@ -240,7 +240,6 @@ icon_state = "iotshotgun" item_state = "shotgun_combat" shaded_charge = TRUE - w_class = WEIGHT_CLASS_BULKY ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima, /obj/item/ammo_casing/energy/laser/ultima) var/obj/item/modular_computer/integratedNTOS var/NTOS_type = /obj/item/modular_computer/internal diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index bc424c5e24d3..f7f0163daa02 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -2,7 +2,7 @@ name = "SL L-204 laser gun" desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal." - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY custom_materials = list(/datum/material/iron=2000) ammo_type = list(/obj/item/ammo_casing/energy/lasergun) ammo_x_offset = 1 @@ -170,7 +170,6 @@ inhand_y_dimension = 64 icon_state = "iotshotgun" item_state = "shotgun_combat" - w_class = WEIGHT_CLASS_BULKY ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima) var/obj/item/modular_computer/integratedNTOS var/NTOS_type = /obj/item/modular_computer/internal @@ -263,7 +262,6 @@ shaded_charge = FALSE ammo_x_offset = 4 charge_sections = 2 - w_class = WEIGHT_CLASS_BULKY slot_flags = 0 diff --git a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm index 3ca3240020b2..10a55857cf88 100644 --- a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm +++ b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm @@ -117,7 +117,6 @@ desc = "The HBG-7 is the standard-issue rifle weapon of the PGF. It comes with a special DMR mode that has greater armor piercing for dealing with armored targets." icon_state = "pgfheavy" item_state = "pgfheavy" - w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK modifystate = FALSE diff --git a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm index 717f12665c22..4a48dd5ea2b4 100644 --- a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm @@ -8,7 +8,6 @@ icon_state = "mauler" item_state = "hp_generic" - w_class = WEIGHT_CLASS_NORMAL default_ammo_type = /obj/item/ammo_box/magazine/m9mm_mauler allowed_ammo_types = list( /obj/item/ammo_box/magazine/m9mm_mauler, @@ -139,6 +138,7 @@ lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi' righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi' mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi' + w_class = WEIGHT_CLASS_BULKY //this gun is visually larger, so I believe this is good icon_state = "pounder" item_state = "pounder" diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index 03d1d4399b87..dcd621a16e94 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -299,7 +299,7 @@ NO_MAG_GUN_HELPER(automatic/pistol/rattlesnake) mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi' - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL default_ammo_type = /obj/item/ammo_box/magazine/m22lr_himehabu allowed_ammo_types = list( /obj/item/ammo_box/magazine/m22lr_himehabu, @@ -350,7 +350,7 @@ NO_MAG_GUN_HELPER(automatic/pistol/himehabu) ammo_type = /obj/item/ammo_casing/c22lr caliber = "22lr" max_ammo = 10 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL multiple_sprites = AMMO_BOX_PER_BULLET //########### SMGS ###########// diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 78326279b6f9..8415c98e41e5 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -18,7 +18,7 @@ /obj/item/reagent_containers/hypospray name = "hypospray" - desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients." + desc = "The hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients." icon = 'icons/obj/syringe.dmi' item_state = "hypo" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -103,15 +103,6 @@ icon_state = "[base_icon_state][(reagents.total_volume > 0) ? null : 0]" return ..() -/obj/item/reagent_containers/hypospray/combat/heresypurge - name = "holy water piercing injector" - desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with 5 doses of a holy water and pacifier mixture. Not for use on your teammates." - item_state = "holy_hypo" - icon_state = "holy_hypo" - volume = 250 - list_reagents = list(/datum/reagent/water/holywater = 150, /datum/reagent/peaceborg/tire = 50, /datum/reagent/peaceborg/confuse = 50) - amount_per_transfer_from_this = 50 - //MediPens /obj/item/reagent_containers/hypospray/medipen diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 5da5f497bda4..a9235c07b741 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -11,7 +11,7 @@ custom_materials = list(/datum/material/iron=6000, /datum/material/glass=3000) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL tool_behaviour = TOOL_RETRACTOR toolspeed = 1 @@ -19,7 +19,6 @@ desc = "Micro-mechanical manipulator for retracting stuff." toolspeed = 0.5 - /obj/item/hemostat name = "hemostat" desc = "A tiny needle-eye has been machined into one of the clamps to streamline the application of ligature." @@ -33,7 +32,7 @@ custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL attack_verb = list("attacked", "pinched") tool_behaviour = TOOL_HEMOSTAT toolspeed = 1 @@ -42,7 +41,6 @@ desc = "Tiny servos power a pair of pincers to stop bleeding." toolspeed = 0.5 - /obj/item/cautery name = "cautery" desc = "An obtuse, rectangular design is just big enough to accomodate this cautery's incredibly durable battery." @@ -56,7 +54,7 @@ custom_materials = list(/datum/material/iron=2500, /datum/material/glass=750) flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL attack_verb = list("burnt") tool_behaviour = TOOL_CAUTERY toolspeed = 1 @@ -97,7 +95,6 @@ w_class = WEIGHT_CLASS_SMALL toolspeed = 0.5 - /obj/item/scalpel name = "scalpel" desc = "The handle of the scalpel is an awkward ergonomic mold, designed to encourage proper form. A blade release button on the end allows for easy cleaning and replacement." @@ -111,7 +108,7 @@ flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL | EYE_STAB force = 10 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_SMALL throwforce = 5 throw_speed = 3 throw_range = 5 diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index d7a44b667a0c..468069b7c228 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index d331d2852361..ab07fb775a04 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ