cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 03:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds colorable hijabs, colorable neck bandannas, lipstick, and Dominian Great House standards. (#11433)

Browse Source
This commit is contained in:
TheStryker
2021-03-17 16:45:32 +08:00
committed by GitHub
parent 21c62c0cb0
commit c1d0b06667
18 changed files with 213 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
View File

@@ -15,6 +15,19 @@
lipsticks["lipstick, jade"] = /obj/item/lipstick/jade
lipsticks["lipstick, black"] = /obj/item/lipstick/black
lipsticks["lipstick, pink"] = /obj/item/lipstick/pink
lipsticks["lipstick, amberred"] = /obj/item/lipstick/amberred
lipsticks["lipstick, cherry"] = /obj/item/lipstick/cherry
lipsticks["lipstick, orange"] = /obj/item/lipstick/orange
lipsticks["lipstick, gold"] = /obj/item/lipstick/gold
lipsticks["lipstick, deepred"] = /obj/item/lipstick/deepred
lipsticks["lipstick, rosepink"] = /obj/item/lipstick/rosepink
lipsticks["lipstick, nude"] = /obj/item/lipstick/nude
lipsticks["lipstick, wine"] = /obj/item/lipstick/wine
lipsticks["lipstick, peach"] = /obj/item/lipstick/peach
lipsticks["lipstick, forestgreen"] = /obj/item/lipstick/forestgreen
lipsticks["lipstick, skyblue"] = /obj/item/lipstick/skyblue
lipsticks["lipstick, teal"] = /obj/item/lipstick/teal
gear_tweaks += new/datum/gear_tweak/path(lipsticks)
/datum/gear/cosmetic/mirror

6
code/modules/client/preference_setup/loadout/loadout_ears.dm
View File

@@ -16,6 +16,11 @@
bandanna["black bandanna"] = /obj/item/clothing/ears/bandanna/black
gear_tweaks += new/datum/gear_tweak/path(bandanna)
/datum/gear/ears/bandanna_colorable
display_name = "neck bandanna (colorable)"
path = /obj/item/clothing/ears/bandanna_colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/ears/headphones
display_name = "headphones"
path = /obj/item/clothing/ears/earmuffs/headphones
@@ -51,3 +56,4 @@
hearingaids["hearing aid, white"] = /obj/item/device/hearing_aid/white
hearingaids["hearing aid, skrellian"] = /obj/item/device/hearing_aid/skrell
gear_tweaks += new/datum/gear_tweak/path(hearingaids)

16
code/modules/client/preference_setup/loadout/loadout_general.dm
View File

@@ -97,6 +97,7 @@
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/banner/New()
..()
var/banners = list()
banners["banner, SolGov"] = /obj/item/flag/sol
@@ -120,6 +121,21 @@
banners["banner, Coalition of Colonies"] = /obj/item/flag/coalition
gear_tweaks += new/datum/gear_tweak/path(banners)
/datum/gear/standard
display_name = "dominian great house standard selection"
path = /obj/item/flag
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/standard/New()
..()
var/standards = list()
standards["standard, Strelitz"] = /obj/item/flag/strelitz
standards["standard, Volvalaad"] = /obj/item/flag/volvalaad
standards["standard, Kazkhz"] = /obj/item/flag/kazkhz
standards["standard, Caladius"] = /obj/item/flag/caladius
standards["standard, Zhao"] = /obj/item/flag/zhao
gear_tweaks += new/datum/gear_tweak/path(standards)
/datum/gear/flag
display_name = "flag selection"
cost = 2

5
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -216,6 +216,11 @@
gear_tweaks += new/datum/gear_tweak/path(hijab)
/datum/gear/head/hijab_colorable
display_name = "colorable hijab"
path = /obj/item/clothing/head/hijab/white
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/turban
display_name = "turban selection"
path = /obj/item/clothing/head/turban

2
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -241,7 +241,7 @@
/datum/gear/uniform/elyra_holo
display_name = "elyran holographic suit selection"
description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Perispolisean clothes respectively."
description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Persepolis clothes respectively."
path = /obj/item/clothing/under/elyra_holo
flags = GEAR_HAS_DESC_SELECTION