diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 44769e21d8e..1cb1de962cb 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -42,7 +42,7 @@ density = 0 anchored = 0 w_class = ITEMSIZE_LARGE - force = 0.0 + force = 0 throwforce = 0.0 throw_speed = 1 throw_range = 20 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 9c4292e2ce7..266e0fec09e 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/radio.dmi' icon_state = "red_phone" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 3.0 + force = 3 throwforce = 2.0 throw_speed = 1 throw_range = 4 @@ -51,7 +51,7 @@ icon_state = "cane" item_state = "stick" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 10 + force = 15 throwforce = 7.0 w_class = ITEMSIZE_LARGE matter = list(DEFAULT_WALL_MATERIAL = 50) @@ -312,7 +312,7 @@ item_state = "telestick" w_class = ITEMSIZE_LARGE slot_flags = null - force = 6 + force = 14 attack_verb = list("smacked", "struck", "slapped") can_support = TRUE else @@ -383,7 +383,7 @@ desc = "A staff which only has the power to make you look like a nerd." icon = 'icons/obj/wizard.dmi' icon_state = "staff" - force = 3.0 + force = 3 throwforce = 5.0 throw_speed = 1 throw_range = 5 @@ -409,7 +409,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "qstaff0" item_state = "stick" - force = 3.0 + force = 3 throwforce = 5.0 throw_speed = 1 throw_range = 5 diff --git a/code/game/gamemodes/changeling/implements/items.dm b/code/game/gamemodes/changeling/implements/items.dm index 3636cbff148..564001d0547 100644 --- a/code/game/gamemodes/changeling/implements/items.dm +++ b/code/game/gamemodes/changeling/implements/items.dm @@ -6,7 +6,7 @@ item_state = "arm_blade" contained_sprite = TRUE w_class = ITEMSIZE_LARGE - force = 30 + force = 33 sharp = TRUE edge = TRUE anchored = TRUE @@ -68,7 +68,7 @@ icon_state = "ling_shield" item_state = "ling_shield" contained_sprite = TRUE - force = 15 //Bash the crap out of people + force = 22 //Bash the crap out of people slot_flags = null anchored = TRUE throwforce = 0 //Just to be on the safe side diff --git a/code/game/gamemodes/cult/items/clothes.dm b/code/game/gamemodes/cult/items/clothes.dm index deb08203f75..809f66c1e78 100644 --- a/code/game/gamemodes/cult/items/clothes.dm +++ b/code/game/gamemodes/cult/items/clothes.dm @@ -58,7 +58,7 @@ icon_state = "cult" item_state = "cult" contained_sprite = TRUE - force = 5 + force = 11 silent = 1 siemens_coefficient = 0.35 //antags don't get exceptions, it's just heavy armor by magical standards armor = list( diff --git a/code/game/gamemodes/cult/items/sword.dm b/code/game/gamemodes/cult/items/sword.dm index 3aa5b4ad445..58076dddd76 100644 --- a/code/game/gamemodes/cult/items/sword.dm +++ b/code/game/gamemodes/cult/items/sword.dm @@ -8,7 +8,7 @@ contained_sprite = TRUE worn_x_dimension = 64 worn_y_dimension = 64 - force = 25 + force = 31 armor_penetration = 50 // Narsie's blessing is strong. Also needed so the cult isn't obliterated by the average voidsuit with melee resistance. w_class = ITEMSIZE_LARGE throwforce = 10 diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index aa2b636d04f..c32de335236 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -200,7 +200,7 @@ desc = "It's a purple gem, attached to a rod and a handle, along with small wires. It looks like it would make a good club." icon = 'icons/obj/technomancer.dmi' icon_state = "scepter" - force = 15 + force = 22 slot_flags = SLOT_BELT attack_verb = list("beaten", "smashed", "struck", "whacked") diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 5638c5925f0..192da1c6728 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -5,7 +5,7 @@ //var/pipe_dir = 0 var/pipename var/connect_types = CONNECT_TYPE_REGULAR - force = 7 + force = 16 icon = 'icons/obj/pipe-item.dmi' icon_state = "simple" item_state = "buildpipe" diff --git a/code/game/machinery/vending_items.dm b/code/game/machinery/vending_items.dm index 767763ae0d3..511f9aed918 100644 --- a/code/game/machinery/vending_items.dm +++ b/code/game/machinery/vending_items.dm @@ -6,7 +6,7 @@ icon_state = "setup_medium-open" item_state = "restock_unit" desc = "A vending machine restock cart." - force = 7 + force = 16 throwforce = 10 throw_speed = 1 throw_range = 7 diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 4ec9e7e2d03..be2e60e9bb6 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -9,7 +9,7 @@ icon_state = "defibunit" item_state = "defibunit" contained_sprite = TRUE - force = 5 + force = 11 throwforce = 6 w_class = ITEMSIZE_LARGE origin_tech = list(TECH_BIO = 4, TECH_POWER = 2) diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index 6857219b16d..5a08f1c9195 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -5,7 +5,7 @@ icon_state = "binoculars" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5.0 + force = 11 w_class = ITEMSIZE_SMALL throwforce = 5.0 throw_range = 15 diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index e172b006776..88738221fe7 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/hacktool.dmi' icon_state = "hacktool-g" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5 + force = 11 w_class = ITEMSIZE_SMALL throwforce = 5 throw_range = 15 diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index a220d971bcc..68b23a6d500 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -337,7 +337,7 @@ desc = "A heavy flashlight, designed for security personnel." icon_state = "maglight" item_state = "maglight" - force = 10 + force = 5 brightness_on = 5 efficiency_modifier = 0.8 w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/items/devices/lightmeter.dm b/code/game/objects/items/devices/lightmeter.dm index d6fecbd2ae3..00e24de2e1e 100644 --- a/code/game/objects/items/devices/lightmeter.dm +++ b/code/game/objects/items/devices/lightmeter.dm @@ -8,7 +8,7 @@ // Copied from debugger.dm obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5.0 + force = 11 w_class = ITEMSIZE_SMALL throwforce = 5.0 throw_range = 15 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 424dcb3decc..d3ab5c990d8 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -13,7 +13,7 @@ item_icons = null contained_sprite = TRUE obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5.0 + force = 11 w_class = ITEMSIZE_SMALL throwforce = 5.0 throw_range = 15 diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index 64105188dec..a33804459bc 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -7,7 +7,7 @@ layer = TURF_LAYER+0.2 obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5.0 + force = 11 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS throwforce = 5.0 diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 6dc3daa8c8d..fe7b602f030 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -11,7 +11,7 @@ //copied from tank.dm obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5.0 + force = 11 throwforce = 10.0 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/devices/tagger.dm b/code/game/objects/items/devices/tagger.dm index 28cf17f74e7..cb0dfb02b46 100644 --- a/code/game/objects/items/devices/tagger.dm +++ b/code/game/objects/items/devices/tagger.dm @@ -4,7 +4,7 @@ name = "animal tagger" desc = "Used for tagging animals to be identified by a ear tag." icon_state = "animal_tagger0" - force = 5.0 + force = 11 w_class = ITEMSIZE_SMALL throwforce = 5.0 throw_range = 15 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 81e71c06ac7..906bf13027f 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -24,7 +24,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list( icon_state = "rods" obj_flags = OBJ_FLAG_CONDUCTABLE w_class = ITEMSIZE_NORMAL - force = 9.0 + force = 20 throwforce = 15.0 throw_speed = 5 throw_range = 20 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index a90581363cc..c11767b9a15 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -38,7 +38,7 @@ singular_name = "synthetic grass tile" desc = "A patch of grass like they often use on golf courses." icon_state = "tile_grass" - force = 1.0 + force = 1 throwforce = 1.0 throw_speed = 5 throw_range = 20 @@ -54,7 +54,7 @@ singular_name = "wood floor tile" desc = "An easy to fit wooden floor tile." icon_state = "tile_wood" - force = 1.0 + force = 1 throwforce = 1.0 throw_speed = 5 throw_range = 20 @@ -104,7 +104,7 @@ singular_name = "carpet" desc = "A piece of carpet. It is the same size as a normal floor tile!" icon_state = "tile_carpet" - force = 1.0 + force = 1 throwforce = 1.0 throw_speed = 5 throw_range = 20 @@ -172,7 +172,7 @@ singular_name = "linoleum" desc = "A piece of linoleum. It is the same size as a normal floor tile!" icon_state = "tile_linoleum" - force = 1.0 + force = 1 throwforce = 1.0 throw_speed = 5 throw_range = 20 @@ -193,7 +193,7 @@ singular_name = "circuit tile" desc = "An advanced tile covered in various circuitry and wiring." icon_state = "tile_bcircuit" - force = 6.0 + force = 14 matter = list(DEFAULT_WALL_MATERIAL = TILE_MATERIAL_AMOUNT, MATERIAL_GLASS = TILE_MATERIAL_AMOUNT) throwforce = 15.0 throw_speed = 5 @@ -205,7 +205,7 @@ singular_name = "circuit tile" desc = "An advanced tile covered in various circuitry and wiring." icon_state = "tile_gcircuit" - force = 6.0 + force = 14 matter = list(DEFAULT_WALL_MATERIAL = TILE_MATERIAL_AMOUNT, MATERIAL_GLASS = TILE_MATERIAL_AMOUNT) throwforce = 15.0 throw_speed = 5 @@ -217,7 +217,7 @@ singular_name = "circuit tile" desc = "An advanced tile covered in various circuitry and wiring." icon_state = "tile_rcircuit" - force = 6.0 + force = 14 matter = list(DEFAULT_WALL_MATERIAL = TILE_MATERIAL_AMOUNT, MATERIAL_GLASS = TILE_MATERIAL_AMOUNT) throwforce = 15.0 throw_speed = 5 @@ -233,7 +233,7 @@ singular_name = "steel tile" desc = "A set of steel floor tiles." icon_state = "tile" - force = 6 + force = 14 matter = list(DEFAULT_WALL_MATERIAL = TILE_MATERIAL_AMOUNT) throwforce = 6 throw_speed = 5 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 21ddb860df2..89c680aa67f 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -573,7 +573,7 @@ equip_sound = /singleton/sound_category/sword_equip_sound obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT | SLOT_BACK - force = 5 + force = 11 throwforce = 5 w_class = ITEMSIZE_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced") diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 668828eee2d..2a6e349add1 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -13,7 +13,7 @@ AI MODULES item_state = "electronic" desc = "An AI Module for transmitting encrypted instructions to the AI." obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5.0 + force = 11 w_class = ITEMSIZE_SMALL throwforce = 5.0 throw_speed = 3 diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index c4b58b67dd1..b6e56452f2f 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -23,7 +23,7 @@ density = FALSE anchored = FALSE obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5 + force = 11 throwforce = 10 throw_speed = 1 throw_range = 5 diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 16c0f07d43e..f9faa1a8259 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -11,7 +11,7 @@ icon_state = "nullrod" item_state = "nullrod" slot_flags = SLOT_BELT - force = 15 + force = 22 throw_speed = 1 throw_range = 4 throwforce = 10 @@ -383,7 +383,7 @@ icon_state = "assunzioneorb" item_state = "assunzioneorb" throwforce = 5 - force = 5 + force = 11 light_range = 1.4 light_power = 1.4 light_color = LIGHT_COLOR_BLUE diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index 97c574ae783..951b26c216b 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -13,7 +13,7 @@ origin_tech = list(TECH_DATA = 2) w_class = ITEMSIZE_SMALL obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5 + force = 11 throwforce = 5 throw_speed = 3 throw_range = 15 diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 2a1ef9603d6..8b2c120f78e 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -11,7 +11,7 @@ w_class = ITEMSIZE_NORMAL throw_speed = 2 throw_range = 10 - force = 8 + force = 18 matter = list(DEFAULT_WALL_MATERIAL = 90) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") amount_per_transfer_from_this = 150 @@ -93,7 +93,7 @@ w_class = ITEMSIZE_HUGE throw_speed = 2 throw_range = 10 - force = 10.0 + force = 15 matter = list(DEFAULT_WALL_MATERIAL = 90) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") drop_sound = 'sound/items/drop/gascan.ogg' @@ -116,7 +116,7 @@ atom_flags = ATOM_FLAG_OPEN_CONTAINER throwforce = 2 w_class = ITEMSIZE_SMALL - force = 2.0 + force = 2 max_water = 60 spray_amount = 10 spray_particles = 1 diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index a762cbd3f8e..74dfaa41bf4 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -4,7 +4,7 @@ item_state = "chemg" desc = "A hand made chemical grenade." w_class = ITEMSIZE_SMALL - force = 2.0 + force = 2 det_time = null unacidable = 1 var/stage = 0 diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index 365118615a8..8e0199bbf64 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -45,7 +45,7 @@ icon_state = "wiredrod" item_state = "rods" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 8 + force = 18 throwforce = 10 w_class = ITEMSIZE_NORMAL attack_verb = list("hit", "bludgeoned", "whacked", "bonked") @@ -92,7 +92,7 @@ icon = 'icons/obj/weapons_build.dmi' icon_state = "shaft" item_state = "rods" - force = 5 + force = 11 throwforce = 3 w_class = ITEMSIZE_LARGE attack_verb = list("hit", "bludgeoned", "whacked", "bonked") @@ -121,7 +121,7 @@ desc = "A pointy spearhead, not really useful without a shaft." icon = 'icons/obj/weapons_build.dmi' icon_state = "spearhead" - force = 5 + force = 11 throwforce = 5 w_class = ITEMSIZE_SMALL attack_verb = list("attacked", "poked") diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 4729af0796f..eb3688febe6 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -244,7 +244,7 @@ base_icon = "spearglass" name = "spear" desc = "A haphazardly-constructed yet still deadly weapon of ancient design." - force = 10 + force = 15 w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK force_divisor = 0.35 // 21 damage for steel (hardness 60) @@ -352,7 +352,7 @@ icon_state = "chainsaw_off" base_icon = "chainsaw_off" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 10 + force = 15 force_unwielded = 10 force_wielded = 20 throwforce = 5 @@ -538,7 +538,7 @@ base_icon = "pike" name = "pike" desc = "A long spear used by the infantry in ancient times." - force = 5 + force = 11 unwielded_force_divisor = 0.2 force_divisor = 0.3 edge = TRUE @@ -558,7 +558,7 @@ base_icon = "halberd" name = "halberd" desc = "A sharp axe mounted on the top of a long spear." - force = 10 + force = 15 unwielded_force_divisor = 0.4 force_divisor = 0.6 sharp = 1 @@ -639,7 +639,7 @@ base_icon = "zweihander" name = "zweihander" desc = "A german upgrade to the einhander models of ancient times." - force = 20 + force = 25 w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK force_wielded = 30 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 36f278f203c..1a024368125 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -132,7 +132,7 @@ name = "energy glaive" desc = "An energized glaive." icon_state = "eglaive0" - force = 20 + force = 25 throwforce = 30 active_force = 40 active_throwforce = 60 @@ -179,13 +179,10 @@ name = "energy axe" desc = "An energised battle axe." icon_state = "axe0" - //active_force = 150 //holy... active_force = 60 active_throwforce = 35 active_w_class = ITEMSIZE_HUGE - //force = 40 - //throwforce = 25 - force = 20 + force = 25 throwforce = 10 throw_speed = 1 throw_range = 5 @@ -362,7 +359,7 @@ base_reflectchance = 10 base_block_chance = 10 active_force = 20 - force = 10 + force = 15 origin_tech = list(TECH_MAGNET = 3) /obj/item/melee/energy/sword/knife/activate(mob/living/user) @@ -376,7 +373,7 @@ base_reflectchance = 10 base_block_chance = 10 active_force = 20 - force = 10 + force = 15 origin_tech = list(TECH_MAGNET = 3) /obj/item/melee/energy/sword/knife/sol/activate(mob/living/user) @@ -426,7 +423,7 @@ name = "energy blade" desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal." icon_state = "blade" - force = 40 + force = 30 active_force = 40 //Normal attacks deal very high damage - about the same as wielded fire axe sharp = TRUE edge = TRUE diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 9fc49570c0f..b692467a8e2 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -15,7 +15,7 @@ item_state = "chain" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 10 + force = 15 throwforce = 7 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_COMBAT = 4) @@ -29,7 +29,7 @@ icon_state = "chainswordoff" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 15 + force = 22 throwforce = 7 w_class = ITEMSIZE_LARGE sharp = 1 @@ -46,7 +46,7 @@ if(active) playsound(user, 'sound/weapons/saw/chainsawstart.ogg', 50, 1) to_chat(user, SPAN_NOTICE("\The [src] rumbles to life.")) - force = 35 + force = 38 hitsound = 'sound/weapons/saw/chainsword.ogg' icon_state = "chainswordon" slot_flags = null @@ -72,7 +72,7 @@ item_state = "kneehammer" contained_sprite = TRUE slot_flags = SLOT_BELT - force = 25 + force = 31 throwforce = 15.0 throw_speed = 5 throw_range = 7 @@ -157,7 +157,7 @@ icon_state = "whip" item_state = "chain" slot_flags = SLOT_BELT - force = 10 + force = 15 w_class = ITEMSIZE_NORMAL reach = 2 attack_verb = list("flogged", "whipped", "lashed", "disciplined") @@ -185,7 +185,7 @@ contained_sprite = TRUE obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 15 + force = 22 throwforce = 5 w_class = ITEMSIZE_LARGE sharp = 1 diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 4b98db28d02..86bf135c770 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -8,7 +8,7 @@ ) icon_state = "mop" item_state = "mop" - force = 3.0 + force = 3 throwforce = 10.0 throw_speed = 3 throw_range = 7 @@ -80,7 +80,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "advmop" item_state = "advmop" - force = 6.0 + force = 14 throwforce = 14 throw_range = 8 cleantime = 15 diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 5b721d6e8cb..073ddf3fb7b 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -5,7 +5,7 @@ icon_state = "cell" item_state = "cell" origin_tech = list(TECH_POWER = 1) - force = 5.0 + force = 11 throwforce = 5.0 throw_speed = 3 throw_range = 5 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index d52608dfede..ee615705c88 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -62,7 +62,7 @@ icon_state = "riot" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK - force = 5.0 + force = 11 throwforce = 5.0 throw_speed = 1 throw_range = 4 @@ -101,7 +101,7 @@ item_state = "square_buckler" contained_sprite = TRUE slot_flags = SLOT_BACK - force = 8 + force = 18 throwforce = 8 base_block_chance = 60 throw_speed = 10 @@ -131,7 +131,7 @@ desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." icon_state = "eshield0" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 3.0 + force = 3 throwforce = 5.0 throw_speed = 1 throw_range = 4 @@ -232,7 +232,7 @@ /obj/item/shield/energy/proc/HandleTurnOn() addtimer(CALLBACK(src, /obj/item/shield/energy/proc/UpdateSoundLoop), 0.25 SECONDS) playsound(src, 'sound/items/shield/energy/shield-start.ogg', 40) - force = 10 + force = 15 w_class = ITEMSIZE_LARGE /obj/item/shield/energy/proc/HandleShutOff() @@ -307,7 +307,7 @@ icon_state = "tactshield" item_state = "tactshield" contained_sprite = 1 - force = 3.0 + force = 3 throwforce = 3.0 throw_speed = 3 throw_range = 4 @@ -336,7 +336,7 @@ if(active) icon_state = "[initial(icon_state)]_[active]" item_state = "[initial(item_state)]_[active]" - force = 5 + force = 11 throwforce = 5 throw_speed = 2 w_class = ITEMSIZE_LARGE diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index a73dca4b220..ff8acd45ba1 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -6,7 +6,7 @@ item_state = "briefcase" contained_sprite = TRUE obj_flags = OBJ_FLAG_CONDUCTABLE - force = 8.0 + force = 18 throw_speed = 1 throw_range = 4 w_class = ITEMSIZE_LARGE diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 452001862e5..9b8c10a4642 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -152,7 +152,7 @@ icon_state = "secure" item_state = "secure" contained_sprite = TRUE - force = 8.0 + force = 18 throw_speed = 1 throw_range = 4 w_class = ITEMSIZE_LARGE @@ -181,7 +181,7 @@ icon_opened = "safe0" icon_locking = "safeb" icon_sparking = "safespark" - force = 8.0 + force = 18 w_class = ITEMSIZE_IMMENSE max_w_class = ITEMSIZE_IMMENSE anchored = 1.0 diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 9a4e73c9e16..6c842f2a567 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -7,7 +7,7 @@ item_state = "red" center_of_mass = list("x" = 16,"y" = 11) obj_flags = OBJ_FLAG_CONDUCTABLE - force = 5 + force = 11 throwforce = 10 throw_speed = 1 throw_range = 7 @@ -109,7 +109,7 @@ icon_state = "syndicate" item_state = "syndicate" origin_tech = list(TECH_COMBAT = 1, TECH_ILLEGAL = 1) - force = 7.0 + force = 16 starts_with = list(\ /obj/item/clothing/gloves/yellow = 1,\ /obj/item/screwdriver = 1,\ diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 8b7c370deaf..2dd547e30d6 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -8,7 +8,7 @@ icon_state = "stunbaton" item_state = "baton" slot_flags = SLOT_BELT - force = 5 + force = 11 sharp = 0 edge = FALSE throwforce = 7 @@ -262,7 +262,7 @@ icon = 'icons/obj/stunrod.dmi' icon_state = "stunrod" item_state = "stunrod" - force = 7 + force = 16 agonyforce = 80 hitcost = 1000 baton_color = "#75ACFF" diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 3461db120e1..5c231a10289 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -71,7 +71,7 @@ hitsound = /singleton/sound_category/drillhit_sound matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000) obj_flags = OBJ_FLAG_CONDUCTABLE - force = 15 + force = 22 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("drilled") @@ -88,7 +88,7 @@ item_state = "scalpel" surgerysound = 'sound/items/surgery/scalpel.ogg' obj_flags = OBJ_FLAG_CONDUCTABLE - force = 10 + force = 15 sharp = 1 edge = TRUE w_class = ITEMSIZE_TINY @@ -113,6 +113,7 @@ surgerysound = 'sound/items/surgery/cautery.ogg' matter = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500) damtype = "fire" + force = 18 /obj/item/surgery/scalpel/manager name = "incision management system" @@ -120,7 +121,7 @@ icon_state = "scalpel_manager" surgerysound = 'sound/items/surgery/cautery.ogg' matter = list (DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 1500, MATERIAL_GOLD = 1500, MATERIAL_DIAMOND = 750) - force = 7.5 + force = 8 /* * Circular Saw @@ -133,7 +134,7 @@ surgerysound = 'sound/items/surgery/circularsaw.ogg' hitsound = 'sound/weapons/saw/circsawhit.ogg' obj_flags = OBJ_FLAG_CONDUCTABLE - force = 15 + force = 22 w_class = ITEMSIZE_NORMAL throwforce = 9 throw_speed = 3 @@ -177,7 +178,7 @@ icon_state = "bonesetter" item_state = "bonesetter" surgerysound = 'sound/items/surgery/bonesetter.ogg' - force = 8 + force = 18 throwforce = 9 throw_speed = 3 throw_range = 5 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 3b38a68bf9b..4c1a8c1794e 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -16,7 +16,7 @@ icon_state = "baton" item_state = "classic_baton" slot_flags = SLOT_BELT - force = 10 + force = 15 drop_sound = 'sound/items/drop/crowbar.ogg' pickup_sound = 'sound/items/pickup/crowbar.ogg' @@ -58,7 +58,7 @@ icon_state = state_extended item_state = state_extended w_class = ITEMSIZE_NORMAL - force = 15 //quite robust + force = 22 //quite robust attack_verb = list("smacked", "struck", "slapped") else user.visible_message(SPAN_NOTICE("\The [user] collapses their telescopic baton."), SPAN_NOTICE("You collapse the baton."), SPAN_NOTICE("You hear a click.")) @@ -112,7 +112,7 @@ icon_state = "nlom_telebaton_0" item_state = "nlom_telebaton_0" state_extended = "nlom_telebaton_1" - force = 5 + force = 11 /obj/item/melee/telebaton/nlom/do_special_effects(var/mob/living/carbon/human/H) spark(H, 5) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 613881667fe..0dbb6b690a5 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -141,7 +141,7 @@ obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL - force = 4.0 + force = 4 distribute_pressure = ONE_ATMOSPHERE*O2STANDARD volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index b7ff0078f34..7657eba7826 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -13,7 +13,7 @@ slot_flags = SLOT_BACK w_class = ITEMSIZE_NORMAL - force = 5.0 + force = 11 throwforce = 10.0 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/weapons/thermal_drill.dm b/code/game/objects/items/weapons/thermal_drill.dm index ed235ff99ba..c958374fe0a 100644 --- a/code/game/objects/items/weapons/thermal_drill.dm +++ b/code/game/objects/items/weapons/thermal_drill.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/safe_drill.dmi' icon_state = "hardened_drill" w_class = ITEMSIZE_HUGE - force = 12 + force = 18 var/time_multiplier = 1 var/datum/looping_sound/thermal_drill/soundloop diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 20883c733f6..2c16486ccea 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -27,7 +27,7 @@ item_state = "wrench" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 8 + force = 18 throwforce = 7 w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) @@ -56,7 +56,7 @@ item_state = "screwdriver" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT | SLOT_EARS - force = 8 + force = 18 throwforce = 5 throw_speed = 3 throw_range = 5 @@ -130,7 +130,7 @@ item_state = "wirecutters" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 6 + force = 14 throw_speed = 2 throw_range = 9 w_class = ITEMSIZE_SMALL @@ -537,7 +537,7 @@ else if(T) T.visible_message("\The [src] turns on.") playsound(loc, 'sound/items/welder_activate.ogg', 50, 1) - force = 15 + force = 22 damtype = DAMAGE_BURN w_class = ITEMSIZE_LARGE welding = TRUE @@ -690,7 +690,7 @@ item_state = "crowbar" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 8 + force = 18 throwforce = 7 w_class = ITEMSIZE_SMALL drop_sound = 'sound/items/drop/crowbar.ogg' @@ -715,7 +715,7 @@ icon_state = "rescue_axe" item_state = "rescue_axe" w_class = ITEMSIZE_NORMAL - force = 12 + force = 18 throwforce = 12 obj_flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you. sharp = TRUE @@ -757,7 +757,7 @@ item_state = "pipewrench" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 8 + force = 18 throwforce = 7 w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 2) @@ -855,7 +855,7 @@ item_state = "impact_wrench" contained_sprite = TRUE item_flags = ITEM_FLAG_HELD_MAP_TEXT - force = 8 + force = 18 attack_verb = list("gored", "drilled", "screwed", "punctured") w_class = ITEMSIZE_SMALL toolspeed = 3 @@ -993,7 +993,7 @@ item_state = "hammer" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 8 + force = 18 throwforce = 5 throw_speed = 3 throw_range = 3 diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 2dfec6ff7f0..bacbca3ac4f 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -536,7 +536,7 @@ icon_base = "medium" icon_state = "medium0" throwforce = 4 - force = 5 + force = 11 w_class = ITEMSIZE_LARGE origin_tech = list(TECH_ENGINEERING = 3) matter = list(DEFAULT_WALL_MATERIAL = 5750) @@ -645,7 +645,7 @@ icon = 'icons/obj/item/traps/traps.dmi' icon_state = "large_foundation" throwforce = 4 - force = 5 + force = 11 w_class = ITEMSIZE_HUGE /obj/item/large_trap_foundation/attackby(obj/item/attacking_item, mob/user) diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index eb9ac9ff62d..2928cd0950d 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -107,7 +107,7 @@ active_force = 20 active_throwforce = 20 active_w_class = ITEMSIZE_HUGE - force = 5 + force = 11 throwforce = 5 throw_speed = 5 throw_range = 10 @@ -189,7 +189,7 @@ desc = "A rather heavy data disk for a Vaurcan hiveship navigation drive." icon = 'icons/obj/vaurca_items.dmi' icon_state = "harddisk" - force = 10 + force = 15 throwforce = 5 w_class = ITEMSIZE_NORMAL contained_sprite = 1 @@ -199,7 +199,7 @@ desc = "A large chunk of alien earth from the distant Vaurcan world of Sedantis I. Just looking at it makes you feel funny." icon_state = "glowing" icon = 'icons/obj/vaurca_items.dmi' - force = 15 + force = 22 throwforce = 30 w_class = ITEMSIZE_LARGE contained_sprite = 1 @@ -212,7 +212,7 @@ contained_sprite = 1 icon = 'icons/obj/vaurca_items.dmi' icon_state = "beacon" - force = 15 + force = 22 throwforce = 30 w_class = ITEMSIZE_LARGE var/seed = /datum/seed/koisspore @@ -404,7 +404,7 @@ armor_penetration = 30 active_throwforce = 20 active_w_class = ITEMSIZE_HUGE - force = 10 + force = 15 throwforce = 10 throw_speed = 5 throw_range = 10 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index f493f334d58..946d35c69d1 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -118,7 +118,7 @@ icon = 'icons/obj/sword.dmi' icon_state = "canesword" item_state = "canesword" - force = 20 + force = 25 throwforce = 5 w_class = ITEMSIZE_LARGE sharp = 1 diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 5a8ee4d651a..3830864ff0a 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -179,7 +179,7 @@ desc_info = "Use in-hand or alt-click to right this." randpixel = 0 center_of_mass = null - force = 10 // Doesn't really matter. Will get overriden by set_material. + force = 15 // Doesn't really matter. Will get overriden by set_material. throwforce = 10 throw_range = 5 force_divisor = 0.4 diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index b68fc5ba307..d5cd7a8b53d 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -5,7 +5,7 @@ var/datum/gas_mixture/air_temporary // used when reconstructing a pipeline that broke var/datum/pipeline/parent var/volume = 0 - force = 20 + force = 25 layer = PIPE_LAYER use_power = POWER_USE_OFF diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 2d34e701a76..0a4d379a4ee 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -386,13 +386,13 @@ switch(tendril_type) if(TENDRIL_SOLID) desc = "An incredibly dense, yet flexible, tendril, removed from an asteroclast." - force = 10 + force = 15 color = COLOR_BRONZE origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) if(TENDRIL_FIRE) desc = "A tendril removed from an asteroclast. It's hot to the touch." damtype = DAMAGE_BURN - force = 15 + force = 22 color = COLOR_AMBER origin_tech = list(TECH_POWER = 2, TECH_BIO = 2) diff --git a/code/modules/cargo/delivery/package.dm b/code/modules/cargo/delivery/package.dm index f37e71d5984..c0f59c3e6d3 100644 --- a/code/modules/cargo/delivery/package.dm +++ b/code/modules/cargo/delivery/package.dm @@ -7,7 +7,7 @@ item_state = "express_package" contained_sprite = TRUE w_class = ITEMSIZE_HUGE - force = 10 + force = 15 slowdown = 1 diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index d2e31561551..64e80ebdc38 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -209,7 +209,7 @@ attack_verb = list("punched", "beaten", "struck") siemens_coefficient = 1 fingerprint_chance = 100 - force = 5 + force = 11 punch_force = 5 clipped = 1 matter = list(DEFAULT_WALL_MATERIAL = 1000) @@ -225,7 +225,7 @@ attack_verb = list("whacked", "fisted", "power-punched") siemens_coefficient = 1 fingerprint_chance = 50 - force = 5 + force = 11 punch_force = 10 clipped = 1 species_restricted = list("exclude",BODYTYPE_GOLEM,BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM,BODYTYPE_VAURCA_BULWARK) @@ -266,7 +266,7 @@ bomb = ARMOR_BOMB_MINOR ) siemens_coefficient = 1 - force = 5 + force = 11 punch_force = 10 clipped = 1 sharp = 1 diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index e65f4cd5289..1bd43bc21f0 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -132,7 +132,7 @@ icon_state = "combat" item_state = "combat" contained_sprite = TRUE - force = 5 + force = 11 armor = list( melee = ARMOR_MELEE_VERY_HIGH, bullet = ARMOR_BALLISTIC_RIFLE, diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index ab658a48800..422fec2d2d6 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -7,7 +7,7 @@ contained_sprite = TRUE center_of_mass = list("x" = 17,"y" = 12) species_restricted = null - force = 5 + force = 11 overshoes = 1 item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_AIRTIGHT|ITEM_FLAG_INJECTION_PORT var/magpulse = 0 @@ -55,7 +55,7 @@ item_flags |= ITEM_FLAG_NO_SLIP magpulse = 1 set_slowdown() - force = 5 + force = 11 if(icon_base) icon_state = "[icon_base]1" item_state = icon_state diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index b6292dcf473..6bed040390a 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -42,7 +42,7 @@ Although made for the Unathi anatomy, they have picked up popularity among other species." icon_state = "caligae" item_state = "caligae" - force = 5 + force = 11 armor = list( melee = ARMOR_MELEE_KNIVES ) diff --git a/code/modules/cooking/machinery/cooking_machines/container.dm b/code/modules/cooking/machinery/cooking_machines/container.dm index 2c216d01bdc..67724aa56fe 100644 --- a/code/modules/cooking/machinery/cooking_machines/container.dm +++ b/code/modules/cooking/machinery/cooking_machines/container.dm @@ -202,7 +202,7 @@ desc = "Chuck ingredients in this to fry something on the stove." icon_state = "skillet" volume = 30 - force = 11 + force = 16 hitsound = 'sound/weapons/smash.ogg' atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react appliancetype = SKILLET @@ -223,7 +223,7 @@ icon_state = "pan" volume = 90 slot_flags = SLOT_HEAD - force = 8 + force = 18 hitsound = 'sound/weapons/smash.ogg' atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react appliancetype = SAUCEPAN @@ -244,7 +244,7 @@ icon_state = "pot" max_space = 50 volume = 180 - force = 8 + force = 18 hitsound = 'sound/weapons/smash.ogg' atom_flags = ATOM_FLAG_OPEN_CONTAINER // Will still react appliancetype = POT diff --git a/code/modules/cooking/trays.dm b/code/modules/cooking/trays.dm index 1fe3b9973d3..fd358e35ed2 100644 --- a/code/modules/cooking/trays.dm +++ b/code/modules/cooking/trays.dm @@ -11,7 +11,7 @@ icon_state = "tray" desc = "A metal tray to lay food on." throwforce = 12.0 - force = 10.0 + force = 15 throw_speed = 1 throw_range = 5 w_class = 3.0 diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index a12cbc9f723..0bb0cda694f 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -7,7 +7,7 @@ opacity = 0 density = 0 anchored = 0.0 - force = 1.0 + force = 1 throwforce = 1.0 throw_speed = 1 throw_range = 2 diff --git a/code/modules/heavy_vehicle/equipment/_equipment.dm b/code/modules/heavy_vehicle/equipment/_equipment.dm index 88a383bd81c..69becc1c2c5 100644 --- a/code/modules/heavy_vehicle/equipment/_equipment.dm +++ b/code/modules/heavy_vehicle/equipment/_equipment.dm @@ -6,7 +6,7 @@ icon_state = "" var/on_mech_icon_state matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_PLASTIC = 5000, MATERIAL_OSMIUM = 500) - force = 10 + force = 15 var/restricted_hardpoints var/mob/living/heavy_vehicle/owner var/list/restricted_software diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 8df93978eb9..f4d629f6ca1 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -259,7 +259,7 @@ desc = "May the force be within you. Sorta." icon = 'icons/obj/weapons.dmi' icon_state = "sword0" - force = 3.0 + force = 3 throw_speed = 1 throw_range = 5 throwforce = 0 @@ -294,7 +294,7 @@ /obj/item/holo/esword/attack_self(mob/living/user as mob) active = !active if (active) - force = 30 + force = 33 icon_state = "sword[item_color]" w_class = ITEMSIZE_LARGE playsound(user, 'sound/weapons/saberon.ogg', 50, 1) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 9c884578435..79be556d763 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -1,7 +1,7 @@ // Stacked resources. They use a material datum for a lot of inherited values. /obj/item/stack/material desc_info = "Use in your hand to bring up the recipe menu. If you have enough sheets, click on something on the list to build it." - force = 5 + force = 11 throwforce = 5 w_class = ITEMSIZE_NORMAL throw_speed = 3 diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 1aa18d0c98a..20fb44eddee 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -7,7 +7,7 @@ randpixel = 8 desc = "A flat disc or piece of metal with an official stamp. An archaic type of currency." obj_flags = OBJ_FLAG_CONDUCTABLE - force = 0.0 + force = 0 throwforce = 0.0 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 56309e5358a..a990754d79e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -13,7 +13,7 @@ obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 4.0 - force = 10.0 + force = 15 w_class = ITEMSIZE_LARGE matter = list(DEFAULT_WALL_MATERIAL = 3750) var/digspeed //moving the delay to an item var so R&D can make improved picks. --NEO @@ -213,7 +213,7 @@ excavation_amount = 100 can_wield = FALSE - force = 15.0 + force = 22 action_button_name = null @@ -225,7 +225,7 @@ digspeed = 5 digspeed_unwielded = 10 excavation_amount = 80 - force = 10 + force = 15 /obj/item/pickaxe/jackhammer name = "sonic jackhammer" @@ -244,7 +244,7 @@ excavation_amount = 100 can_wield = FALSE - force = 25.0 + force = 31 action_button_name = null @@ -287,7 +287,7 @@ excavation_amount = 100 can_wield = 0 - force = 20.0 + force = 25 digspeed = 2 digspeed_unwielded = 3 force_unwielded = 20.0 @@ -308,7 +308,7 @@ autodrill = TRUE drill_sound = 'sound/weapons/drill.ogg' can_wield = FALSE - force = 15.0 + force = 22 excavation_amount = 100 action_button_name = null @@ -327,7 +327,7 @@ item_state = "shovel" obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT - force = 8.0 + force = 18 throwforce = 4.0 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) @@ -351,7 +351,7 @@ ) icon_state = "spade" item_state = "spade" - force = 5.0 + force = 11 throwforce = 7.0 w_class = ITEMSIZE_SMALL @@ -360,7 +360,7 @@ desc = "A standard-issue Gadpathurian entrenching tool. Sharpened edges make this tool/weapon equally adept at breaking earth and collarbones." icon_state = "gadpathur_shovel" item_state = "gadpathur_shovel" - force = 10 + force = 15 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1, TECH_COMBAT = 2) attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked", "slashed", "cut") @@ -1003,7 +1003,7 @@ var/list/total_extraction_beacons = list() item_state = "resonator" desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vacuum." w_class = ITEMSIZE_NORMAL - force = 15 + force = 22 throwforce = 10 var/burst_time = 30 var/fieldlimit = 4 @@ -1101,7 +1101,7 @@ var/list/total_extraction_beacons = list() item_state = "magneto" desc = "A handheld device that creates a well of negative force that attracts minerals of a very specific type, size, and state to its user." w_class = ITEMSIZE_NORMAL - force = 10 + force = 15 throwforce = 5 origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 3) @@ -1139,7 +1139,7 @@ var/list/total_extraction_beacons = list() item_state = "jaunter" desc = "A handheld device that creates a well of warp energy that teleports minerals of a very specific type, size, and state to its user." w_class = ITEMSIZE_NORMAL - force = 15 + force = 22 throwforce = 5 origin_tech = list(TECH_BLUESPACE = 4, TECH_ENGINEERING = 3) var/last_oresummon_time = 0 diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index dfab076d4b1..1cdba47f403 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -650,5 +650,5 @@ var/list/holder_mob_icon_cache = list() icon_state = "cod_rest" item_state = "cod_rest" hitsound = 'sound/effects/snap.ogg' - force = 6//quite large fishey + force = 14//quite large fishey throwforce = 6 diff --git a/code/modules/mob/living/carbon/slime/items.dm b/code/modules/mob/living/carbon/slime/items.dm index 63f06cc0604..2a67434d3e3 100644 --- a/code/modules/mob/living/carbon/slime/items.dm +++ b/code/modules/mob/living/carbon/slime/items.dm @@ -3,7 +3,7 @@ desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." icon = 'icons/mob/npc/slimes.dmi' icon_state = "grey slime extract" - force = 1.0 + force = 1 w_class = ITEMSIZE_TINY throwforce = 0 throw_speed = 3 diff --git a/code/modules/multiz/mobile_ladders.dm b/code/modules/multiz/mobile_ladders.dm index 202b9deac07..0c88cc2126e 100644 --- a/code/modules/multiz/mobile_ladders.dm +++ b/code/modules/multiz/mobile_ladders.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/multiz_items.dmi' contained_sprite = TRUE throw_range = 3 - force = 10 + force = 15 w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 9b4ac0d1949..4b3abdcbfb8 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -5,7 +5,7 @@ parent_organ = BP_HEAD vital = TRUE icon_state = "brain" - force = 1.0 + force = 1 w_class = ITEMSIZE_SMALL throwforce = 1.0 throw_speed = 3 diff --git a/code/modules/paperwork/typewriter.dm b/code/modules/paperwork/typewriter.dm index 691ede70ceb..6abbb980d4c 100644 --- a/code/modules/paperwork/typewriter.dm +++ b/code/modules/paperwork/typewriter.dm @@ -12,7 +12,7 @@ said, rural areas and less urban parts of the planet still rely heavily on these machines." icon_state = "typewriter" icon = 'icons/obj/device.dmi' - force = 20 + force = 25 throwforce = 5 w_class = ITEMSIZE_NORMAL drop_sound = 'sound/items/drop/metalweapon.ogg' @@ -121,7 +121,7 @@ icon_state = "typewriter_case_closed" item_state = "briefcase_black" contained_sprite = TRUE - force = 10 + force = 15 throwforce = 5 throw_speed = 1 throw_range = 4 diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm index 989c098cd06..c10ae1ed116 100644 --- a/code/modules/power/antimatter/containment_jar.dm +++ b/code/modules/power/antimatter/containment_jar.dm @@ -4,7 +4,7 @@ desc_antag = "Antimatter is extremely volatile, and containment jars are not particularly strong. Weak explosions will reduce the container's integrity, and larger ones will cause it to explode immediately." icon = 'icons/obj/machinery/antimatter.dmi' icon_state = "jar" - force = 8 + force = 18 throwforce = 10 throw_speed = 1 throw_range = 2 diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm index 38f89164221..f36514c5096 100644 --- a/code/modules/power/lights/bulbs.dm +++ b/code/modules/power/lights/bulbs.dm @@ -94,7 +94,7 @@ if(status == LIGHT_OK || status == LIGHT_BURNED) visible_message(SPAN_WARNING("\The [src] shatters!"), SPAN_WARNING("You hear a small glass object shatter!")) status = LIGHT_BROKEN - force = 5 + force = 11 sharp = TRUE playsound(get_turf(src), 'sound/effects/glass_hit.ogg', 75, TRUE) new /obj/item/material/shard(get_turf(src)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 2a9b9b3e4fd..4d0d9670c46 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -57,7 +57,7 @@ throwforce = 5 throw_speed = 4 throw_range = 5 - force = 5 + force = 11 origin_tech = list(TECH_COMBAT = 1) attack_verb = list("struck", "hit", "bashed") zoomdevicename = "scope" diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index fb8b22c4d8e..38483adaf84 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -70,7 +70,7 @@ item_state = "noisecannon" recoil = 1 - force = 10 + force = 15 projectile_type = /obj/item/projectile/energy/sonic cell_type = /obj/item/cell/super fire_delay = 40 diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index 2b5a78c1d43..130ccf83502 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/code/modules/projectiles/guns/energy/blaster.dm @@ -8,7 +8,7 @@ fire_sound = 'sound/weapons/laser1.ogg' slot_flags = SLOT_BELT|SLOT_HOLSTER w_class = ITEMSIZE_SMALL - force = 5 + force = 11 origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2) matter = list(DEFAULT_WALL_MATERIAL = 2000) offhand_accuracy = 1 @@ -84,7 +84,7 @@ offhand_accuracy = 0 projectile_type = /obj/item/projectile/energy/blaster/heavy - force = 10 + force = 15 slot_flags = SLOT_BACK w_class = ITEMSIZE_LARGE can_bayonet = TRUE diff --git a/code/modules/projectiles/guns/energy/cult.dm b/code/modules/projectiles/guns/energy/cult.dm index 11a61125899..3d6f6041713 100644 --- a/code/modules/projectiles/guns/energy/cult.dm +++ b/code/modules/projectiles/guns/energy/cult.dm @@ -10,7 +10,7 @@ fire_sound = 'sound/weapons/laserstrong.ogg' slot_flags = SLOT_BACK w_class = ITEMSIZE_LARGE - force = 10 + force = 15 max_shots = 5 fire_delay = 25 accuracy = -1 diff --git a/code/modules/projectiles/guns/energy/disruptor.dm b/code/modules/projectiles/guns/energy/disruptor.dm index e27559764a9..d53d91b8e09 100644 --- a/code/modules/projectiles/guns/energy/disruptor.dm +++ b/code/modules/projectiles/guns/energy/disruptor.dm @@ -8,7 +8,7 @@ fire_sound = 'sound/weapons/gunshot/bolter.ogg' slot_flags = SLOT_BELT|SLOT_HOLSTER w_class = ITEMSIZE_NORMAL - force = 5 + force = 11 origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(DEFAULT_WALL_MATERIAL = 2000) projectile_type = /obj/item/projectile/energy/disruptorstun @@ -56,7 +56,7 @@ desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal. This is the magnum version." icon = 'icons/obj/guns/disruptorpistol/disruptorpistolm.dmi' max_shots = 15 - force = 6 + force = 14 /obj/item/gun/energy/disruptorpistol/magnum/security pin = /obj/item/device/firing_pin/wireless diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 155a650df97..0b840f5eccd 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -9,7 +9,7 @@ slot_flags = SLOT_BELT|SLOT_BACK accuracy = 1 w_class = ITEMSIZE_NORMAL - force = 10 + force = 15 origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(DEFAULT_WALL_MATERIAL = 2000) projectile_type = /obj/item/projectile/beam/midlaser @@ -65,7 +65,7 @@ icon_state = "caplaser" item_state = "caplaser" has_item_ratio = FALSE - force = 5 + force = 11 fire_sound = 'sound/weapons/laser1.ogg' slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL @@ -153,7 +153,7 @@ charge_cost = 400 max_shots = 4 fire_delay = 45 - force = 10 + force = 15 w_class = ITEMSIZE_LARGE accuracy = -3 //shooting at the hip scoped_accuracy = 4 @@ -189,7 +189,7 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE accuracy = 0 - force = 10 + force = 15 matter = list(DEFAULT_WALL_MATERIAL = 2000) origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2) projectile_type = /obj/item/projectile/beam/shotgun diff --git a/code/modules/projectiles/guns/energy/mining.dm b/code/modules/projectiles/guns/energy/mining.dm index daaa3d325a7..ef6db5b185d 100644 --- a/code/modules/projectiles/guns/energy/mining.dm +++ b/code/modules/projectiles/guns/energy/mining.dm @@ -11,7 +11,7 @@ fire_sound = 'sound/weapons/plasma_cutter.ogg' slot_flags = SLOT_BELT|SLOT_BACK accuracy = 1 - force = 15 + force = 22 sharp = TRUE edge = TRUE origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3) diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm index 9e6509ab776..5c456cb5f8a 100644 --- a/code/modules/projectiles/guns/energy/modular.dm +++ b/code/modules/projectiles/guns/energy/modular.dm @@ -10,7 +10,7 @@ fire_sound = 'sound/weapons/laser1.ogg' slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_NORMAL - force = 10 + force = 15 origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(DEFAULT_WALL_MATERIAL = 2000) can_turret = TRUE diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 7bbe57786af..9f65833839f 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -48,7 +48,7 @@ item_state = "nucgun" origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3) slot_flags = SLOT_BELT - force = 8 //looks heavier than a pistol + force = 18 //looks heavier than a pistol self_recharge = 1 modifystate = null reliability = 95 @@ -272,7 +272,7 @@ icon_state = "particlepistol" item_state = "particlepistol" slot_flags = SLOT_BELT|SLOT_HOLSTER - force = 5 + force = 11 projectile_type = /obj/item/projectile/beam/stun/skrell secondary_projectile_type = /obj/item/projectile/beam/pulse/skrell @@ -289,7 +289,7 @@ item_state = "particlesmg" slot_flags = SLOT_BELT|SLOT_HOLSTER|SLOT_BACK max_shots = 14 - force = 7 + force = 16 projectile_type = /obj/item/projectile/beam/stun/skrell secondary_projectile_type = /obj/item/projectile/beam/pulse/skrell diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index f1d2fa1dfee..e8d30ff2fd4 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -5,7 +5,7 @@ icon_state = "pulse_carbine" item_state = "pulse_carbine" slot_flags = SLOT_BELT - force = 5 + force = 11 fire_sound='sound/weapons/laser1.ogg' projectile_type = /obj/item/projectile/beam sel_mode = 2 diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm index 94d3186f7c0..c0c37bea0fa 100644 --- a/code/modules/projectiles/guns/energy/rifle.dm +++ b/code/modules/projectiles/guns/energy/rifle.dm @@ -8,7 +8,7 @@ fire_sound = 'sound/weapons/Taser.ogg' slot_flags = SLOT_BACK w_class = ITEMSIZE_LARGE - force = 10 + force = 15 max_shots = 20 fire_delay = 6 burst_delay = 3 @@ -211,7 +211,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE accuracy = 1 - force = 10 + force = 15 obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK charge_cost = 300 diff --git a/code/modules/projectiles/guns/energy/scythe.dm b/code/modules/projectiles/guns/energy/scythe.dm index 5ead3df2728..4b5234d817d 100644 --- a/code/modules/projectiles/guns/energy/scythe.dm +++ b/code/modules/projectiles/guns/energy/scythe.dm @@ -6,7 +6,7 @@ icon_state = "hunterkiller_scythe" item_state = "hunterkiller_scythe" w_class = ITEMSIZE_HUGE - force = 25 + force = 31 armor_penetration = 30 slot_flags = SLOT_BACK fire_sound = 'sound/weapons/railgun.ogg' diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index a09588c574b..950aea9806b 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -126,7 +126,7 @@ has_item_ratio = FALSE w_class = ITEMSIZE_NORMAL fire_sound = 'sound/weapons/taser2.ogg' - force = 5 + force = 11 projectile_type = /obj/item/projectile/beam/mousegun slot_flags = SLOT_HOLSTER | SLOT_BELT max_shots = 6 @@ -200,7 +200,7 @@ charge_meter = 0 w_class = ITEMSIZE_LARGE fire_sound = 'sound/magic/LightningShock.ogg' - force = 30 + force = 33 projectile_type = /obj/item/projectile/energy/bfg slot_flags = SLOT_BACK max_shots = 3 @@ -224,7 +224,7 @@ charge_meter = 0 slot_flags = SLOT_BACK w_class = ITEMSIZE_LARGE - force = 10 + force = 15 projectile_type = /obj/item/projectile/beam/gatlinglaser max_shots = 350 sel_mode = 1 @@ -283,7 +283,7 @@ w_class = ITEMSIZE_NORMAL accuracy = 1 recoil = 1 - force = 10 + force = 15 projectile_type = /obj/item/projectile/energy/blaster/incendiary max_shots = 7 burst = 1 @@ -395,7 +395,7 @@ fire_sound = 'sound/magic/lightningbolt.ogg' slot_flags = SLOT_BACK w_class = ITEMSIZE_LARGE - force = 15 + force = 22 projectile_type = /obj/item/projectile/beam/thermaldrill max_shots = 90 burst = 10 @@ -475,7 +475,7 @@ charge_meter = 0 w_class = ITEMSIZE_LARGE fire_sound = 'sound/magic/LightningShock.ogg' - force = 30 + force = 33 projectile_type = /obj/item/projectile/beam/tesla slot_flags = SLOT_BACK max_shots = 3 @@ -501,7 +501,7 @@ charge_meter = 0 w_class = ITEMSIZE_LARGE fire_sound = 'sound/magic/Repulse.ogg' - force = 30 + force = 33 projectile_type = /obj/item/projectile/energy/gravitydisabler slot_flags = SLOT_BACK max_shots = 2 diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index cfca1b13b6e..14207dbc288 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -69,7 +69,7 @@ name = "energy crossbow" desc = "A weapon favored by mercenary infiltration teams." w_class = ITEMSIZE_LARGE - force = 10 + force = 15 icon_state = "crossbowlarge" item_state = "crossbow" matter = list(DEFAULT_WALL_MATERIAL = 200000) diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 3191deaa7cc..8fe888d060a 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -5,7 +5,7 @@ icon_state = "grenadelauncher" item_state = "grenadelauncher" w_class = ITEMSIZE_LARGE - force = 10 + force = 15 fire_sound = 'sound/weapons/grenadelaunch.ogg' fire_sound_text = "a metallic thunk" @@ -113,7 +113,7 @@ name = "underslung grenade launcher" desc = "Not much more than a tube and a firing mechanism, this grenade launcher is designed to be fitted to a rifle." w_class = ITEMSIZE_NORMAL - force = 5 + force = 11 max_grenades = 0 //load and unload directly into chambered diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index 18695967f83..4994ca3a05a 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -7,7 +7,7 @@ w_class = ITEMSIZE_LARGE throw_speed = 2 throw_range = 10 - force = 5.0 + force = 11 obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = 0 origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5) diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index d49c1643199..43cea3ef06c 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -68,7 +68,7 @@ icon_state = "syringegun" item_state = "syringegun" w_class = ITEMSIZE_NORMAL - force = 7 + force = 16 matter = list(DEFAULT_WALL_MATERIAL = 2000) slot_flags = SLOT_BELT diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index 896e2c664ff..82d11626832 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -8,7 +8,7 @@ item_state = "ishotgun" max_shells = 2 w_class = ITEMSIZE_LARGE - force = 5 + force = 11 recoil = 2 accuracy = -1 slot_flags = SLOT_BACK @@ -44,7 +44,7 @@ icon_state = "ishotgunsawn" item_state = "ishotgunsawn" w_class = ITEMSIZE_NORMAL - force = 5 + force = 11 slot_flags &= ~SLOT_BACK slot_flags |= (SLOT_BELT|SLOT_HOLSTER) name = "sawn-off improvised shotgun" @@ -73,7 +73,7 @@ item_state = "ishotgunsawn" slot_flags = SLOT_BELT|SLOT_HOLSTER w_class = ITEMSIZE_NORMAL - force = 5 + force = 11 // shotgun construction diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index a75efab3e21..bb909b67def 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -232,7 +232,7 @@ icon = 'icons/obj/guns/deagle.dmi' icon_state = "deagle" item_state = "deagle" - force = 10 + force = 15 accuracy = 1 caliber = ".50" load_method = MAGAZINE diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index f5c56488ea0..caad6c0617f 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -71,7 +71,7 @@ accuracy_wielded = 1 fire_delay = ROF_UNWIELDY fire_delay_wielded = ROF_SUPERHEAVY - force = 10 + force = 15 recoil = 10 recoil_wielded = 5 @@ -288,7 +288,7 @@ fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' ammo_type = /obj/item/ammo_casing/c38 magazine_type = /obj/item/ammo_magazine/c38 - force = 15 + force = 22 sharp = TRUE edge = TRUE fire_delay = ROF_PISTOL diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index 77723ba58df..0bf3b25d8ec 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/code/modules/projectiles/guns/projectile/rifle.dm @@ -335,7 +335,7 @@ load_method = MAGAZINE handle_casings = DELETE_CASINGS - force = 10 + force = 15 slot_flags = SLOT_BACK can_bayonet = TRUE knife_x_offset = 23 diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 972405181f1..c97e20dd72b 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -51,7 +51,7 @@ item_state = "shotgun" max_shells = 7 // max of 8 w_class = ITEMSIZE_LARGE - force = 10 + force = 15 obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BACK caliber = "shotgun" @@ -143,7 +143,7 @@ handle_casings = CYCLE_CASINGS max_shells = 2 w_class = ITEMSIZE_LARGE - force = 10 + force = 15 obj_flags = OBJ_FLAG_CONDUCTABLE is_wieldable = TRUE var/has_wield_state = TRUE @@ -190,7 +190,7 @@ accuracy = 0 is_wieldable = FALSE w_class = ITEMSIZE_NORMAL - force = 5 + force = 11 slot_flags &= ~SLOT_BACK //you can't sling it on your back slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not. name = "sawn-off shotgun" @@ -208,7 +208,7 @@ slot_flags = SLOT_BELT|SLOT_HOLSTER ammo_type = /obj/item/ammo_casing/shotgun/pellet w_class = ITEMSIZE_NORMAL - force = 5 + force = 11 /obj/item/gun/projectile/shotgun/foldable name = "foldable shotgun" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index c0da359fe90..2600f074ffb 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -8,7 +8,7 @@ icon_state = "heavysniper" item_state = "heavysniper" w_class = ITEMSIZE_LARGE - force = 10 + force = 15 slot_flags = SLOT_BACK origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) caliber = "14.5mm" @@ -147,7 +147,7 @@ icon_state = "tranqsniper" item_state = "tranqsniper" w_class = ITEMSIZE_LARGE - force = 10 + force = 15 slot_flags = SLOT_BACK origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2) caliber = "PPS" @@ -183,7 +183,7 @@ The rifle is commonly issued to the feared Das'nrra Marksmen." w_class = ITEMSIZE_LARGE - force = 10 + force = 15 slot_flags = SLOT_BACK origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 5) caliber = "a762" @@ -236,7 +236,7 @@ icon_state = "w556rifle" item_state = "w556rifle" w_class = ITEMSIZE_LARGE - force = 10 + force = 15 slot_flags = SLOT_BACK origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3) caliber = "a556" diff --git a/code/modules/psionics/abilities/psi_punch.dm b/code/modules/psionics/abilities/psi_punch.dm index 3c369d58bfb..12120d7bf4d 100644 --- a/code/modules/psionics/abilities/psi_punch.dm +++ b/code/modules/psionics/abilities/psi_punch.dm @@ -11,7 +11,7 @@ icon_state = "generic" cast_methods = CAST_MELEE aspect = ASPECT_PSIONIC - force = 20 + force = 25 armor_penetration = 20 cooldown = 0 psi_cost = 3 diff --git a/code/modules/psionics/equipment/psipower_blade.dm b/code/modules/psionics/equipment/psipower_blade.dm index 1a2abd2ebf4..8167a83061b 100644 --- a/code/modules/psionics/equipment/psipower_blade.dm +++ b/code/modules/psionics/equipment/psipower_blade.dm @@ -1,6 +1,6 @@ /obj/item/psychic_power/psiblade name = "psionic blade" - force = 10 + force = 15 sharp = 1 edge = TRUE maintain_cost = 1 @@ -11,13 +11,13 @@ . = ..() switch(owner.psi.get_rank()) if(PSI_RANK_SENSITIVE) - force = 20 + force = 25 armor_penetration = 10 if(PSI_RANK_HARMONIOUS) - force = 25 + force = 31 armor_penetration = 20 if(PSI_RANK_APEX) - force = 30 + force = 33 armor_penetration = 30 icon_state = "psiblade_long" if(PSI_RANK_LIMITLESS) diff --git a/code/modules/psionics/equipment/psipower_tinker.dm b/code/modules/psionics/equipment/psipower_tinker.dm index 37b62525e80..d76fd21a848 100644 --- a/code/modules/psionics/equipment/psipower_tinker.dm +++ b/code/modules/psionics/equipment/psipower_tinker.dm @@ -1,7 +1,7 @@ /obj/item/psychic_power/tinker name = "psychokinetic crowbar" icon_state = "crowbar" - force = 5 + force = 11 var/emulating = "crowbar" var/list/tools = list("crowbar", "wrench", "screwdriver", "cutters") diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index a73b099034e..ecbb965de4b 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -11,7 +11,7 @@ amount_per_transfer_from_this = 5//Smaller sip size for more BaRP and less guzzling a litre of vodka before you realise it volume = 100 item_state = "broken_beer" //Generic held-item sprite until unique ones are made. - force = 5 + force = 11 hitsound = /singleton/sound_category/bottle_hit_intact_sound var/smash_duration = 5 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) matter = list(MATERIAL_GLASS = 800) @@ -229,7 +229,7 @@ desc = "A bottle with a sharp broken bottom." icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi' icon_state = "broken_bottle" - force = 9 + force = 20 throwforce = 5 throw_speed = 3 throw_range = 5 diff --git a/code/modules/reagents/reagent_containers/food/drinks/trophy.dm b/code/modules/reagents/reagent_containers/food/drinks/trophy.dm index 8b55de835f5..2f77ce49143 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/trophy.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/trophy.dm @@ -41,7 +41,7 @@ desc = "At least you ranked!" icon_state = "bronze_cup" w_class = ITEMSIZE_SMALL - force = 5 + force = 11 throwforce = 4 amount_per_transfer_from_this = 10 matter = list(MATERIAL_IRON = 40) diff --git a/code/modules/reagents/reagent_containers/ladle.dm b/code/modules/reagents/reagent_containers/ladle.dm index 295c495101a..3a9c9036607 100644 --- a/code/modules/reagents/reagent_containers/ladle.dm +++ b/code/modules/reagents/reagent_containers/ladle.dm @@ -7,7 +7,7 @@ possible_transfer_amounts = list(10, 15, 30) w_class = ITEMSIZE_SMALL volume = 30 - force = 6 + force = 14 atom_flags = ATOM_FLAG_OPEN_CONTAINER item_flags = ITEM_FLAG_NO_BLUDGEON drop_sound = 'sound/items/drop/glass.ogg' diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm index 901f63c063e..4fdb9a5ec4d 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm @@ -11,7 +11,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)." excavation_amount = 0.5 drill_sound = 'sound/weapons/thudswoosh.ogg' @@ -30,7 +30,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)." excavation_amount = 1 drill_sound = 'sound/items/Screwdriver.ogg' @@ -49,7 +49,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)." excavation_amount = 2 drill_sound = 'sound/items/Screwdriver.ogg' @@ -68,7 +68,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)." excavation_amount = 3 drill_sound = 'sound/items/Screwdriver.ogg' @@ -87,7 +87,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)." excavation_amount = 4 drill_sound = 'sound/items/Screwdriver.ogg' @@ -106,7 +106,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)." excavation_amount = 5 drill_sound = 'sound/items/Screwdriver.ogg' @@ -125,7 +125,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 2.0 + force = 2 desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)." excavation_amount = 6 drill_sound = 'sound/items/Screwdriver.ogg' @@ -143,7 +143,7 @@ digspeed = 20 digspeed_unwielded = 20 digspeed_wielded = 20 - force = 10.0 + force = 15 desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)." excavation_amount = 15 drill_sound = /singleton/sound_category/pickaxe_sound diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 117c13dc166..c3143676597 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -108,7 +108,7 @@ icon = 'icons/obj/telescience.dmi' icon_state = "rcs" obj_flags = OBJ_FLAG_CONDUCTABLE - force = 10 + force = 15 throwforce = 10 throw_speed = 2 throw_range = 5 diff --git a/html/changelogs/mattatlas-changelog.yml b/html/changelogs/mattatlas-changelog.yml new file mode 100644 index 00000000000..929ef3e0b30 --- /dev/null +++ b/html/changelogs/mattatlas-changelog.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - experiment: "Buffed the force of most melee items." + - tweak: "The maglight has been nerfed to not do more damage than most melee items."