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

Fix the H.O.N.K. mech assembly process by redefining the bikehorn as a tool #9877

Merged
merged 4 commits into from
Sep 23, 2023
Merged

Fix the H.O.N.K. mech assembly process by redefining the bikehorn as a tool #9877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
346aae2
defining the bikehorn as a tool, and refactoring the honker construct…
MARTIN-Patrick-Edmont Sep 21, 2023
3141b34
Merge branch 'BeeStation:master' into honkerfix
thebigpgm153 Sep 22, 2023
5ac4b4d
wrong name for toolspeed
thebigpgm153 Sep 22, 2023
a3dac8f
removed a comment that makes no sense
thebigpgm153 Sep 22, 2023
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 @@ -17,6 +17,7 @@
#define TOOL_KNIFE "knife"
#define TOOL_BLOODFILTER "bloodfilter"
#define TOOL_RUSTSCRAPER "rustscraper"
#define TOOL_BIKEHORN "bike horn"
// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
// tool sound is only played when op is started. If not, it's played twice.
#define MIN_TOOL_SOUND_DELAY 20
Expand Down
18 changes: 9 additions & 9 deletions code/game/mecha/mecha_construction_paths.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,63 +709,63 @@
result = /obj/mecha/combat/honker
steps = list(
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/circuitboard/mecha/honker/main,
"action" = ITEM_DELETE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/circuitboard/mecha/honker/peripherals,
"action" = ITEM_DELETE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/circuitboard/mecha/honker/targeting,
"action" = ITEM_DELETE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/stock_parts/scanning_module,
"action" = ITEM_MOVE_INSIDE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/stock_parts/capacitor,
"action" = ITEM_MOVE_INSIDE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/stock_parts/cell,
"action" = ITEM_MOVE_INSIDE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/clothing/mask/gas/clown_hat,
"action" = ITEM_DELETE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
list(
"key" = /obj/item/clothing/shoes/clown_shoes,
"action" = ITEM_DELETE
),
list(
"key" = /obj/item/bikehorn
"key" = TOOL_BIKEHORN
),
)

Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/clown_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
throw_speed = 3
throw_range = 7
attack_verb = list("HONKED")
tool_behaviour = TOOL_BIKEHORN
toolspeed = 1
///sound file given to the squeaky component we make in Initialize() so sub-types can specify their own sound
var/sound_file = 'sound/items/bikehorn.ogg'

Expand Down