Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Two-handed component - #19365

Merged
ToasterBiome merged 16 commits into
yogstation13:masterfrom
JohnFulpWillard:twohanded
Jul 24, 2023
Merged

Two-handed component#19365
ToasterBiome merged 16 commits into
yogstation13:masterfrom
JohnFulpWillard:twohanded

Conversation

@JohnFulpWillard

@JohnFulpWillard JohnFulpWillard commented Jun 22, 2023

Copy link
Copy Markdown
Member

Document the changes in your pull request

This ports /datum/component/two_handed from TG and some other minor things that were necessary for it to work.

Currently there's a Null rod that's meant to be two-handed. Instead of having the component, it currently exists to be used in the Chaplain's null rod menu, then DELETES ITSELF when picked up, SPAWNS a NEW, COMPLETELY separate item with the SAME icon, name, attack verb, desc, strength, gives THAT item the antimagic component, then puts it in your hand. It's insane, it's crazy. It's... no longer needed.

Changelog

🆑
experimental: Added the two-handed component. Fireaxes, Double-bladed Eswords, Pitchforks, Binoculars, Baseball bats, etc. should all work the same, but now have a better backend that allows us to do more stuff with it, like making the Chaplain's null rod not delete itself upon being picked up.
/:cl:

this will require update_appearance to properly compile.
Haven't ran updatepaths yet, I'm just saving my progress.
@github-actions github-actions Bot added the Mapping Will result in a change to a map. label Jun 22, 2023
@Moltijoe

Copy link
Copy Markdown
Contributor

oh god bless, the nullrod jank workaround was the only clean way i could think of doing it

@tattax tattax added Refactor Makes old code less shit and removed Mapping Will result in a change to a map. labels Jun 28, 2023
@github-actions github-actions Bot added the Mapping Will result in a change to a map. label Jun 28, 2023
@JohnFulpWillard JohnFulpWillard mentioned this pull request Jul 13, 2023
9 tasks
@JohnFulpWillard
JohnFulpWillard marked this pull request as ready for review July 22, 2023 01:33
@JohnFulpWillard
JohnFulpWillard requested review from a team as code owners July 22, 2023 01:33

@ToasterBiome ToasterBiome left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ok

@ToasterBiome
ToasterBiome merged commit 040129b into yogstation13:master Jul 24, 2023
Yogbot-13 added a commit that referenced this pull request Jul 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Mapping Will result in a change to a map. Refactor Makes old code less shit

Projects

Status: Completed Ports

Development

Successfully merging this pull request may close these issues.

4 participants