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

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
8aaf589
Adds HUD Aviators
Nerev4r Jul 1, 2018
26c96ff
smolfix
Nerev4r Aug 5, 2018
3b9cacd
Merge branch 'development' into topgun
Nerev4r Aug 5, 2018
8c33241
Merge branch 'development' into topgun
skull132 Aug 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions code/datums/uplink/devices and tools.dm
View file
Open in desktop
Expand Up @@ -119,3 +119,15 @@
name = "HUDPatch, Night-Vision"
item_cost = 4
path = /obj/item/clothing/glasses/eyepatch/hud/night

/datum/uplink_item/item/tools/aviatortherm
name = "Aviators, Thermal"
item_cost = 6
path = /obj/item/clothing/glasses/thermal/aviator
desc = "A pair of thermal-vision glasses disguised as aviator shades."

/datum/uplink_item/item/tools/aviatornight
name = "Aviators, Night-Vision"
item_cost = 4
path = /obj/item/clothing/glasses/night/aviator
desc = "A pair of night-vision glasses disguised as aviator shades."
3 changes: 2 additions & 1 deletion code/game/antagonist/outsider/raider.dm
View file
Open in desktop
Expand Up @@ -42,7 +42,8 @@ var/datum/antagonist/raider/raiders
var/list/raider_glasses = list(
/obj/item/clothing/glasses/thermal,
/obj/item/clothing/glasses/eyepatch/hud/thermal,
/obj/item/clothing/glasses/thermal/plain/monocle
/obj/item/clothing/glasses/thermal/plain/monocle,
/obj/item/clothing/glasses/thermal/aviator
)

var/list/raider_helmets = list(
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/security.dm
View file
Open in desktop
Expand Up @@ -42,7 +42,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/head(H), slot_glasses)
if(H.backbag == 1)
H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_store)
else
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson/aviator(src)
new /obj/item/device/multitool(src)
new /obj/item/device/flash(src)
new /obj/item/taperoll/engineering(src)
Expand Down Expand Up @@ -123,6 +124,7 @@
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/glasses/meson/aviator(src)
new /obj/item/weapon/cartridge/engineering(src)
new /obj/item/taperoll/engineering(src)

Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View file
Open in desktop
Expand Up @@ -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(src)


/obj/structure/closet/secure_closet/CMO
Expand Down Expand Up @@ -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(src)

/obj/structure/closet/secure_closet/CMO2
name = "chief medical officer's attire"
Expand Down
5 changes: 4 additions & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Expand Up @@ -141,6 +141,7 @@
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/ammo_magazine/tranq(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/clothing/glasses/sunglasses/sechud/head(src)
new /obj/item/weapon/shield/riot/tact(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/melee/telebaton(src)
Expand Down Expand Up @@ -175,7 +176,7 @@
new /obj/item/clothing/head/beret/sec/hos(src)
new /obj/item/clothing/head/helmet/HoS(src)
//Tools
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/device/radio/headset/heads/hos(src)
//Belts
new /obj/item/weapon/storage/belt/security(src)
Expand Down Expand Up @@ -218,6 +219,7 @@
//Tools
new /obj/item/weapon/cartridge/security(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
Expand Down Expand Up @@ -280,6 +282,7 @@
new /obj/item/clothing/head/helmet(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/ammo_magazine/c45m/rubber(src)
new /obj/random/handgun(src)
Expand Down
38 changes: 36 additions & 2 deletions code/modules/client/preference_setup/loadout/loadout_eyes.dm
View file
Open in desktop
Expand Up @@ -33,6 +33,16 @@
display_name = "science Goggles"
path = /obj/item/clothing/glasses/science

/datum/gear/eyes/materialaviators
display_name = "aviators, material"
path = /obj/item/clothing/glasses/material/aviator
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice","Shaft Miner")

/datum/gear/eyes/mesonaviators
display_name = "aviators, meson"
path = /obj/item/clothing/glasses/meson/aviator
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist")

/datum/gear/eyes/mesonprescription
display_name = "meson goggles, prescription"
path = /obj/item/clothing/glasses/meson/prescription
Expand All @@ -43,20 +53,44 @@
path = /obj/item/clothing/glasses/hud/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")

/datum/gear/eyes/security/aviator
display_name = "aviators, security"
path = /obj/item/clothing/glasses/sunglasses/sechud/aviator

/datum/gear/eyes/medical
display_name = "medical HUD"
path = /obj/item/clothing/glasses/hud/health
allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Psychiatrist", "Medical Resident")

/datum/gear/eyes/medical/aviator
display_name = "aviators, medical"
path = /obj/item/clothing/glasses/hud/health/aviator

/datum/gear/eyes/shades
display_name = "sunglasses, fat"
display_name = "sunglasses, fat (Security/Command)"
path = /obj/item/clothing/glasses/sunglasses/big
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Head of Personnel", "Quartermaster", "Internal Affairs Agent", "Detective", "Forensic Technician")

/datum/gear/eyes/shades/prescriptionsun
display_name = "sunglasses, presciption"
display_name = "sunglasses, presciption (Security/Command)"
path = /obj/item/clothing/glasses/sunglasses/prescription

/datum/gear/eyes/shades/aviator
display_name = "sunglasses, aviator (Security/Command)"
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.

path = /obj/item/clothing/glasses/fakesunglasses

/datum/gear/eyes/glasses/fakesun/prescription
display_name = "prescription sunglasses, stylish"
path = /obj/item/clothing/glasses/fakesunglasses/prescription

/datum/gear/eyes/glasses/fakesun/aviator
display_name = "aviators, stylish"
path = /obj/item/clothing/glasses/fakesunglasses/aviator

/datum/gear/eyes/hudpatch
display_name = "iPatch"
path = /obj/item/clothing/glasses/eyepatch/hud
Expand Down