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

Jump to bottom

Adds HUD aviators #4961

Merged
merged 4 commits into from Aug 5, 2018
Merged

Adds HUD aviators #4961

merged 4 commits into from Aug 5, 2018

Conversation

Nerev4r
Copy link
Contributor

@Nerev4r Nerev4r commented Jul 1, 2018

Adds HUD aviators, they can be toggled onto HUD mode or just appearing as aviators. Security variant transforms from security HUD to flash protection. In turn, I've taken away their default glasses in exchange for these. This also adds civilian sunglasses to the loadout for fashion purposes.

mybabies

@Nerev4r Nerev4r requested a review from skull132 as a code owner July 1, 2018 05:11
@BotBOREALIS
Copy link
Collaborator

Icons with diff:

icons/mob/eyes.dmi
Key Old New Status
sec_hud sec_hud Created
sec_hud[1] sec_hud[1] Created
sec_hud[2] sec_hud[2] Created
sec_hud[3] sec_hud[3] Created
sec_flash sec_flash Created
sec_flash[1] sec_flash[1] Created
sec_flash[2] sec_flash[2] Created
sec_flash[3] sec_flash[3] Created
aviator aviator Created
aviator[1] aviator[1] Created
aviator[2] aviator[2] Created
aviator[3] aviator[3] Created
aviator_eng aviator_eng Created
aviator_eng[1] aviator_eng[1] Created
aviator_eng[2] aviator_eng[2] Created
aviator_eng[3] aviator_eng[3] Created
aviator_med aviator_med Created
aviator_med[1] aviator_med[1] Created
aviator_med[2] aviator_med[2] Created
aviator_med[3] aviator_med[3] Created
aviator_nv aviator_nv Created
aviator_nv[1] aviator_nv[1] Created
aviator_nv[2] aviator_nv[2] Created
aviator_nv[3] aviator_nv[3] Created
aviator_thr aviator_thr Created
aviator_thr[1] aviator_thr[1] Created
aviator_thr[2] aviator_thr[2] Created
aviator_thr[3] aviator_thr[3] Created
aviator_mat aviator_mat Created
aviator_mat[1] aviator_mat[1] Created
aviator_mat[2] aviator_mat[2] Created
aviator_mat[3] aviator_mat[3] Created
icons/obj/clothing/glasses.dmi
Key Old New Status
sec_hud sec_hud Created
sec_flash sec_flash Created
aviator aviator Created
aviator_eng aviator_eng Created
aviator_med aviator_med Created
aviator_nv aviator_nv Created
aviator_thr aviator_thr Created
aviator_mat aviator_mat Created

@Nerev4r Nerev4r force-pushed the topgun branch 2 times, most recently from 0d524b0 to e81de02 Compare July 1, 2018 06:50
@Lohikar
Copy link
Contributor

Lohikar commented Jul 1, 2018

How do these look in-game?

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 1, 2018

it compiles now i promise. also give me a second.

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 1, 2018 •
edited

medicaloff Medical off
medicalon Medical on
medicalonside Medical on side
securityhud Security HUD
securityhudside Security HUD Side
securityflash Security Flash
securityflashside Security Flash Side
engineeringon Meson On
engineeringonside Meson On Side
engineeringoffside Meson Off
engineeringoffside Meson Off Side (they're all aviator)
materialon Material On
materialonside Material On Side
thermalon Thermal On
thermalonside Thermal On Side
nighton Night On
nightonside Night On Side
Additional Security Underneath
sec1
sec2
sec3
sec4

@Alberyk Alberyk added Review Required Sprites Adds new or changes existing sprites. labels Jul 1, 2018
@LordFowl LordFowl added the Feedback Required The PR requires a feedback topic and feedback on the forum. label Jul 1, 2018
@LordFowl
Copy link
Contributor

LordFowl commented Jul 1, 2018

Create a feedback thread.

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 1, 2018

https://forums.aurorastation.org/viewtopic.php?f=18&t=11447

@Arrow768 Arrow768 added this to the July Update milestone Jul 2, 2018
@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 2, 2018

I have added a verb.

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 2, 2018 •
edited

Sprites have been changed a little. For some reason, the rims were transparent.
sprite1
sprite2

@Nerev4r Nerev4r force-pushed the topgun branch 2 times, most recently from 3d5c1c8 to a83cfce Compare July 4, 2018 04:03
@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 4, 2018

A special pair of aviators for the HoS have been added, functionality is similar to the old sechudglasses.
sechd
sechd2

skull132
skull132 suggested changes Jul 13, 2018
View reviewed changes
Copy link
Contributor

@skull132 skull132 left a comment

Choose a reason for hiding this comment

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

Some obvious issues detected.

Also, not sure how I feel about them being the main stay now in sec. IMO they should remain optional, because not everyone enjoys aviators.

code/game/objects/structures/crates_lockers/closets/secure/medical.dm Outdated
@@ -84,6 +84,7 @@
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/clothing/glasses/hud/health/aviator
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing argument (src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm Outdated
@@ -112,6 +113,7 @@
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/storage/box/inhalers(src)
new /obj/item/clothing/glasses/hud/health/aviator
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing argument (src)

code/modules/client/preference_setup/loadout/loadout_eyes.dm
path = /obj/item/clothing/glasses/sunglasses/aviator

/datum/gear/eyes/glasses/fakesun
display_name = "sunglasses, stylish"
Copy link
Contributor

Choose a reason for hiding this comment

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

Not too sure how I feel about this.

@Arrow768
Copy link
Member

We talked about this in the dev channel and reached the following decision:

  • Both security sunglasses should be available in the lockers (the current glasses and the aviators)

Marking this as changes required until implemented. Use the review command when done.

@Arrow768 Arrow768 added Changes Required The PR requires changes before it can be approved and/or merged. and removed Review Required labels Jul 18, 2018
@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 18, 2018

!review

@BotBOREALIS BotBOREALIS added Review Required and removed Changes Required The PR requires changes before it can be approved and/or merged. labels Jul 18, 2018
@Alberyk Alberyk modified the milestones: July Update, August Update Jul 22, 2018
@skull132
Copy link
Contributor

Migrated this to August. The changelog's out of date for one.

For two, it's worth considering whether this nerf is actually a good idea or not.

For three, at the moment, aviatorHUDs have the toggle behaviour, normal HUDs don't. Which is kinda weird?

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Jul 22, 2018

I was told by Arrow that 'nobody wants' the toggle behaviour.

Arrow768
Arrow768 requested changes Aug 4, 2018
View reviewed changes
code/game/jobs/job/security.dm Outdated
@@ -84,7 +84,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves)
else
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/aviator(H), slot_glasses)
Copy link
Member

Choose a reason for hiding this comment

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

You are still replacing them here

@Nerev4r
Copy link
Contributor Author

Nerev4r commented Aug 5, 2018

fixed speedmerge now

@skull132 skull132 merged commit f1dd7d5 into Aurorastation:development Aug 5, 2018
@Nerev4r Nerev4r deleted the topgun branch August 5, 2018 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Arrow768 Arrow768 Arrow768 approved these changes

@skull132 skull132 skull132 approved these changes

Assignees
No one assigned
Labels
Awaiting Merge Feedback Required The PR requires a feedback topic and feedback on the forum. Sprites Adds new or changes existing sprites.
Projects
None yet
Milestone
Update August 2018
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Nerev4r @BotBOREALIS @Lohikar @LordFowl @Arrow768 @skull132 @Alberyk