cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts the force of all items to be multiplied. (#18708)

Browse Source 
* force balancing?

* force

* cl & maglight nerf

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2024-03-24 17:10:31 +00:00
committed by GitHub
co-authored by DreamySkrell <> Matt Atlas
parent e54a5297a5
commit fec6dbe24f
101 changed files with 255 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/defib.dm
+1 -1
View File
@@ -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)
code/game/objects/items/devices/binoculars.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/debugger.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/lighting/flashlight.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/lightmeter.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/spy_bug.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/suit_cooling.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/tagger.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/rods.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/tiles/tile_types.dm
+8 -8
View File
@@ -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
code/game/objects/items/toys.dm
+1 -1
View File
@@ -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")
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/RFD.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/chaplain_items.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/circuitboards/circuitboard.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/extinguisher.dm
+3 -3
View File
@@ -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
code/game/objects/items/weapons/grenades/chem_grenade.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/improvised_components.dm
+3 -3
View File
@@ -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")
code/game/objects/items/weapons/material/twohanded.dm
+5 -5
View File
@@ -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
code/game/objects/items/weapons/melee/energy.dm
+5 -8
View File
@@ -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
code/game/objects/items/weapons/melee/misc.dm
+6 -6
View File
@@ -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
code/game/objects/items/weapons/mop.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/power_cells.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/shields.dm
+6 -6
View File
@@ -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
code/game/objects/items/weapons/storage/briefcase.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/storage/secure.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/storage/toolbox.dm
+2 -2
View File
@@ -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,\
code/game/objects/items/weapons/stunbaton.dm
+2 -2
View File
@@ -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"
code/game/objects/items/weapons/surgery_tools.dm
+6 -5
View File
@@ -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
code/game/objects/items/weapons/swords_axes_etc.dm
+3 -3
View File
@@ -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)
code/game/objects/items/weapons/tanks/tank_types.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/thermal_drill.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/tools.dm
+9 -9
View File
@@ -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("<span class='danger'>\The [src] turns on.</span>")
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
code/game/objects/items/weapons/traps.dm
+2 -2
View File
@@ -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)
code/game/objects/items/weapons/vaurca_items.dm
+5 -5
View File
@@ -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
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -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
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+1 -1
View File
@@ -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