Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sledgehammer Bonus Damage #4284

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
800d1b3
Update TGS DMAPI
actions-user Oct 18, 2024
53a9aa5
Merge pull request #3 from generalthrax/tgs-dmapi-update
generalthrax Nov 9, 2024
68f8874
Revert "Automatic TGS DMAPI Update"
generalthrax Nov 9, 2024
cd4c878
Merge pull request #4 from generalthrax/revert-3-tgs-dmapi-update
generalthrax Nov 9, 2024
3e5b6dc
Merge branch 'shiptest-ss13:master' into master
generalthrax Nov 19, 2024
12c0280
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Dec 1, 2024
2bc6035
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Dec 4, 2024
edb920d
Merge branch 'shiptest-ss13:master' into master
generalthrax Dec 7, 2024
7253543
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Dec 13, 2024
2cb1e5b
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Dec 13, 2024
4b2c5b2
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Dec 17, 2024
4070291
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Dec 23, 2024
2d9450e
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Jan 8, 2025
9640991
Merge branch 'shiptest-ss13:master' into master
generalthrax Jan 15, 2025
e12dc32
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Jan 22, 2025
742616c
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Jan 31, 2025
1a4e781
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Feb 14, 2025
2fa561c
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Feb 15, 2025
8aafe90
Merge branch 'master' of https://github.com/generalthrax/Shiptest
generalthrax Feb 25, 2025
42151ae
Merge branch 'shiptest-ss13:master' into master
generalthrax Feb 26, 2025
f05fd5e
finally
generalthrax Feb 27, 2025
960628e
stuff
generalthrax Feb 27, 2025
ea001ad
150
generalthrax Feb 27, 2025
21630a4
bleh
generalthrax Feb 27, 2025
9e35dd8
desc
generalthrax Feb 27, 2025
ac437ff
80
generalthrax Feb 27, 2025
b82b9d9
100
generalthrax Feb 27, 2025
621ee92
check (probably better way to do this but you're gonna have to tell m…
generalthrax Feb 28, 2025
8de9600
Merge branch 'master' into hammertweaks
generalthrax Mar 12, 2025
c6d170a
wa
generalthrax Mar 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions code/game/objects/items/melee/fireaxe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
var/obj/structure/W = A
W.obj_destruction("axe")
if(tool_behaviour == TOOL_MINING)
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/girder))
var/obj/structure/W = A
W.obj_destruction("axe")

/obj/item/melee/axe/fire // DEM AXES MAN, marker -Agouri
name = "fire axe"
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
icon_state = "fireaxe"
base_icon_state = "fireaxe"
demolition_mod = 1.25

/obj/item/melee/axe/bone // Blatant imitation of the fireaxe, but made out of bone.
name = "bone axe"
Expand All @@ -62,17 +65,17 @@ Blunt
icon_state = "sledgehammer"
base_icon_state = "sledgehammer"
name = "breaching sledgehammer"
desc = "A large hammer used by the Gorlex Marauder splinters. As powerful as a weapon as it is a shipbreaking and mining tool."
desc = "A large hammer used by the Gorlex Marauder splinters. As powerful as a weapon as it is a shipbreaking tool."
force = 5
armour_penetration = 40
demolition_mod = 2
toolspeed = 0.5
wall_decon_damage = MINERAL_WALL_INTEGRITY
attack_verb = list("bashed", "smashed", "crushed", "smacked")
hitsound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
slot_flags = ITEM_SLOT_BACK
sharpness = IS_BLUNT
toolspeed = 0.5
wall_decon_damage = MINERAL_WALL_INTEGRITY
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
demolition_mod = 2
var/wielded = FALSE

/obj/item/melee/axe/sledgehammer/ComponentInitialize()
Expand Down
Loading