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.

Sign up for GitHub

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 28 commits into
base: master
Choose a base branch
from
+9 −4
Open

Sledgehammer Bonus Damage #4284

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 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
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
1 change: 1 addition & 0 deletions code/__DEFINES/tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define TOOL_WELDER "welder"
#define TOOL_ANALYZER "analyzer"
#define TOOL_MINING "mining"
#define TOOL_SLEDGEHAMMER "sledgehammer"
#define TOOL_SHOVEL "shovel"
#define TOOL_RETRACTOR "retractor"
#define TOOL_HEMOSTAT "hemostat"
Expand Down
8 changes: 3 additions & 5 deletions code/game/objects/items/melee/fireaxe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if(!proximity)
return
if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/girder))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure if its a girder it does a check for TOOL_SLEDGEHAMMER

var/obj/structure/W = A
W.obj_destruction("axe")

Expand Down Expand Up @@ -61,15 +61,13 @@ 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
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')
var/wielded = FALSE

Expand All @@ -85,7 +83,7 @@ Blunt
/obj/item/melee/axe/sledgehammer/proc/on_wield(obj/item/source, mob/user)
SIGNAL_HANDLER

tool_behaviour = TOOL_MINING
tool_behaviour = TOOL_SLEDGEHAMMER
wielded = TRUE

/obj/item/melee/axe/sledgehammer/proc/on_unwield(obj/item/source, mob/user)
Expand Down
2 changes: 2 additions & 0 deletions code/game/turfs/closed/_closed.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@
dam = 20
else if(I.tool_behaviour == TOOL_MINING)
dam *= (4/3)
else if (I.tool_behaviour == TOOL_SLEDGEHAMMER)
dam = 100
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and again you need to do it as a multiplier.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How would you do it as a multiplier? The author of destructible walls suggested I do it this way.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dam = 100
dam *= 2

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted it to specifically be 100 so it could also destroy mineral rock walls since I don't know how to make it both do extra damage to walls and also be a mining tool at the same time

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesnt really need to 1 shot mineral rock walls. its not a dedicated pickaxe.

Copy link
Contributor Author

@generalthrax generalthrax Feb 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original concept that Apogee and us agreed on was a joint breaching-mining tool for marauders. In fact, it is currently mapped into fullmerged NGR and Hardliner ships as a mining tool.

else
switch(I.damtype)
if(BRUTE)
Expand Down
Loading