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

Content: Flight suit and helmet #49246

Merged
merged 7 commits into from
Jun 12, 2021
Merged

Conversation

BrettDong
Copy link
Member

@BrettDong BrettDong commented Jun 10, 2021

Summary

Content "Flight suit and helmet"

Purpose of change

#49119 was accidentally merged to master. It was then purged from master. Now "re-open" #49119 and base on 0.F-dev.

faefux and others added 7 commits June 10, 2021 11:28
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
@faefux
Copy link
Contributor

faefux commented Jun 10, 2021

I am sorry I fucked the PR up so badly generally. I thought I had a somewhat handle over how to use github but rebasing my repo was...

@kevingranade
Copy link
Member

Not really your fault at all @faefux

@kevingranade kevingranade merged commit 2423638 into CleverRaven:0.F-dev Jun 12, 2021
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
* Flight gear
Co-authored-by: Binrui Dong <[email protected]>
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Co-authored-by: fae <[email protected]>
Co-authored-by: faefux <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: chaohedgehogs <[email protected]>
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
* Flight gear
Co-authored-by: Binrui Dong <[email protected]>
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Co-authored-by: fae <[email protected]>
Co-authored-by: faefux <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: chaohedgehogs <[email protected]>
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
* Flight gear
Co-authored-by: Binrui Dong <[email protected]>
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Co-authored-by: fae <[email protected]>
Co-authored-by: faefux <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: chaohedgehogs <[email protected]>
ZhilkinSerg pushed a commit that referenced this pull request Jun 21, 2021
* Flight gear
Co-authored-by: Binrui Dong <[email protected]>
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Co-authored-by: fae <[email protected]>
Co-authored-by: faefux <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: chaohedgehogs <[email protected]>
@ZhilkinSerg ZhilkinSerg mentioned this pull request Jun 21, 2021
14 tasks
ZhilkinSerg pushed a commit that referenced this pull request Jul 3, 2021
* Flight gear
Co-authored-by: Binrui Dong <[email protected]>
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Co-authored-by: fae <[email protected]>
Co-authored-by: faefux <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: chaohedgehogs <[email protected]>
anothersimulacrum pushed a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 3, 2021
* Flight gear
Co-authored-by: Binrui Dong <[email protected]>
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Co-authored-by: fae <[email protected]>
Co-authored-by: faefux <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: chaohedgehogs <[email protected]>
@BrettDong BrettDong deleted the flight-suit branch November 11, 2021 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants