cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds faction HUDsunglasses and sec aviators + fat HUDsunglasses (#12378)

Browse Source
This commit is contained in:
Jaraci
2021-08-26 18:54:27 -03:00
committed by GitHub
parent cecda64dc2
commit 78a45ccaf8
6 changed files with 145 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+1
View File
@@ -94,6 +94,7 @@
..()
var/list/sechud = list()
sechud["sunglasses, security"] = /obj/item/clothing/glasses/sunglasses/sechud
sechud["fat sunglasses, security"] = /obj/item/clothing/glasses/sunglasses/sechud/big
sechud["aviators, security"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator
sechud["HUD, security"] = /obj/item/clothing/glasses/hud/security
sechud["HUDpatch, security"] = /obj/item/clothing/glasses/eyepatch/hud/security
code/modules/client/preference_setup/loadout/loadout_factions.dm
+48
View File
@@ -44,6 +44,22 @@
path = /obj/item/reagent_containers/glass/rag/advanced/idris
faction = "Idris Incorporated"
/datum/gear/faction/idris_sunglasses
display_name = "idris security HUD selection"
description = "A selection of Idris security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/idris
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
faction = "Idris Incorporated"
/datum/gear/faction/idris_sunglasses/New()
..()
var/list/idris_sunglasses = list()
idris_sunglasses["HUDsunglasses, Idris"] = /obj/item/clothing/glasses/sunglasses/sechud/idris
idris_sunglasses["fat HUDsunglasses, Idris"] = /obj/item/clothing/glasses/sunglasses/sechud/big/idris
idris_sunglasses["aviator sunglasses, Idris"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/idris
gear_tweaks += new /datum/gear_tweak/path(idris_sunglasses)
/datum/gear/faction/zavodskoi_beret
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi
@@ -72,6 +88,22 @@
slot = slot_wear_suit
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavod_sunglasses
display_name = "zavodskoi security HUD selection"
description = "A selection of Zavodskoi security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/zavod
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavod_sunglasses/New()
..()
var/list/zavod_sunglasses = list()
zavod_sunglasses["HUDsunglasses, Zavodskoi"] = /obj/item/clothing/glasses/sunglasses/sechud/zavod
zavod_sunglasses["fat HUDsunglasses, Zavodskoi"] = /obj/item/clothing/glasses/sunglasses/sechud/big/zavod
zavod_sunglasses["aviator sunglasses, Zavodskoi"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/zavod
gear_tweaks += new /datum/gear_tweak/path(zavod_sunglasses)
/datum/gear/faction/eridani_beret
display_name = "eridani beret"
path = /obj/item/clothing/head/beret/security/eri
@@ -84,6 +116,22 @@
slot = slot_head
faction = "Eridani Private Military Contractors"
/datum/gear/faction/epmc_sunglasses
display_name = "EPMC security HUD selection"
description = "A selection of EPMC security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/epmc
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
faction = "Eridani Private Military Contractors"
/datum/gear/faction/epmc_sunglasses/New()
..()
var/list/epmc_sunglasses = list()
epmc_sunglasses["HUDsunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/epmc
epmc_sunglasses["fat HUDsunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/big/epmc
epmc_sunglasses["aviator sunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/epmc
gear_tweaks += new /datum/gear_tweak/path(epmc_sunglasses)
/datum/gear/faction/zenghu_uniform_alt
display_name = "zeng-hu white uniform"
path = /obj/item/clothing/under/rank/zeng/alt
code/modules/clothing/glasses/glasses.dm
+55 -2
View File
@@ -596,7 +596,7 @@ BLIND // can't see anything
/obj/item/clothing/glasses/sunglasses/sechud
name = "HUDsunglasses"
desc = "Sunglasses with a HUD."
desc = "Sunglasses in the colours of NanoTrasen security. They come with a blue-tinted HUD."
icon_state = "sunhud"
/obj/item/clothing/glasses/sunglasses/sechud/Initialize()
@@ -607,6 +607,41 @@ BLIND // can't see anything
/obj/item/clothing/glasses/sunglasses/sechud/is_sec_hud()
return active
/obj/item/clothing/glasses/sunglasses/sechud/big
name = "fat HUDsunglasses"
desc = "Fat sunglasses in the colours of NanoTrasen security. They come with a blue-tinted HUD."
icon_state = "bigsunglasses_hud"
/obj/item/clothing/glasses/sunglasses/sechud/zavod
name = "Zavodskoi HUDsunglasses"
desc = "Sunglasses in the colours of Zavodskoi Interstellar. They come with a red-tinted HUD."
icon_state = "sunhud_zavod"
/obj/item/clothing/glasses/sunglasses/sechud/big/zavod
name = "fat Zavodskoi HUDsunglasses"
desc = "Fat sunglasses in the colours of Zavodskoi Interstellar. They come with a red-tinted HUD."
icon_state = "bigsunglasses_hud_zavod"
/obj/item/clothing/glasses/sunglasses/sechud/epmc
name = "EPMC HUDsunglasses"
desc = "Sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish."
icon_state = "sunhud_epmc"
/obj/item/clothing/glasses/sunglasses/sechud/big/epmc
name = "fat EPMC HUDsunglasses"
desc = "Fat sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish."
icon_state = "bigsunglasses_hud_epmc"
/obj/item/clothing/glasses/sunglasses/sechud/idris
name = "Idris HUDsunglasses"
desc = "Sunglasses in the colours of Idris Incorporated. They come with a teal-tinted HUD and a chrome finish."
icon_state = "sunhud_idris"
/obj/item/clothing/glasses/sunglasses/sechud/big/idris
name = "fat Idris HUDsunglasses"
desc = "Fat sunglasses in the colours of Idris Incorporated. They come with a teal-tinted HUD and a chrome finish."
icon_state = "bigsunglasses_hud_idris"
/obj/item/clothing/glasses/sunglasses/sechud/tactical
name = "tactical HUD"
desc = "Flash-resistant goggles with inbuilt combat and security information."
@@ -623,7 +658,7 @@ BLIND // can't see anything
/obj/item/clothing/glasses/sunglasses/sechud/aviator
name = "HUD aviators"
desc = "Modified aviator glasses that can be switched between HUD and flash protection modes. Comes with bonus prescription overlay."
desc = "NanoTrasen security aviator glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay."
flash_protection = FLASH_PROTECTION_NONE
icon_state = "aviator_sec"
off_state = "aviator_sec_off"
@@ -677,6 +712,24 @@ BLIND // can't see anything
attack_self(usr)
/obj/item/clothing/glasses/sunglasses/sechud/aviator/zavod
name = "Zavodskoi HUD aviators"
desc = "Zavodskoi security aviator glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay."
icon_state = "aviator_sec_zavod"
off_state = "aviator_sec_zavod_off"
/obj/item/clothing/glasses/sunglasses/sechud/aviator/epmc
name = "EPMC HUD aviators"
desc = "Eridani PMC security aviator glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay."
icon_state = "aviator_sec_epmc"
off_state = "aviator_sec_epmc_off"
/obj/item/clothing/glasses/sunglasses/sechud/aviator/idris
name = "Idris HUD aviators"
desc = "Idris security aviator glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay."
icon_state = "aviator_sec_idris"
off_state = "aviator_sec_idris_off"
/obj/item/clothing/glasses/thermal
name = "optical thermal scanner"
desc = "Thermals in the shape of glasses."
html/changelogs/omicega-fdsfsdr454sdfsd!!!.yml
+41
View File
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Omicega
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds faction HUDsunglasses and security aviators for Zavodskoi, Idris, and EPMC security personnel, as well as fat HUDsunglasses variations for all of these plus the default."
icons/mob/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

icons/obj/clothing/glasses.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 13 KiB