cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01: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 09:45:32 +01: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
code/game/objects/items/weapons/cosmetics.dm
+53 -1
View File
@@ -23,15 +23,67 @@
name = "black lipstick"
colour = "black"
/obj/item/lipstick/amberred
name = "amberred lipstick"
colour = "amberred"
/obj/item/lipstick/cherry
name = "cherry lipstick"
colour = "cherry"
/obj/item/lipstick/orange
name = "orange lipstick"
colour = "orange"
/obj/item/lipstick/gold
name = "gold lipstick"
colour = "gold"
/obj/item/lipstick/purple
name = "purple lipstick"
colour = "purple"
/obj/item/lipstick/deepred
name = "deepred lipstick"
colour = "deepred"
/obj/item/lipstick/pink
name = "pink lipstick"
colour = "pink"
/obj/item/lipstick/rosepink
name = "rosepink lipstick"
colour = "rosepink"
/obj/item/lipstick/nude
name = "nude lipstick"
colour = "nude"
/obj/item/lipstick/wine
name = "wine lipstick"
colour = "wine"
/obj/item/lipstick/peach
name = "peach lipstick"
colour = "peach"
/obj/item/lipstick/forestgreen
name = "forestgreen lipstick"
colour = "forestgreen"
/obj/item/lipstick/skyblue
name = "skyblue lipstick"
colour = "skyblue"
/obj/item/lipstick/teal
name = "teal lipstick"
colour = "teal"
/obj/item/lipstick/random
name = "lipstick"
/obj/item/lipstick/random/New()
colour = pick("red","purple","jade","pink","black")
colour = pick("red","purple","jade","black","amberred","cherry","orange","gold","purple","deepred","pink","rosepink","nude","wine","peach","forestgreen","skyblue","teal")
name = "[colour] lipstick"
code/game/objects/structures/signs.dm
+59
View File
@@ -698,6 +698,65 @@
desc = "A green Dominian standard which represents the dionae within the Empire."
icon_state = "diona"
/obj/item/flag/strelitz
name = "House Strelitz standard"
desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \
They are known for their military service and emphasis on personal bravery."
flag_path = "strelitz"
/obj/structure/sign/flag/strelitz
name = "House Strelitz standard"
desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \
They are known for their military service and emphasis on personal bravery."
icon_state = "strelitz"
/obj/item/flag/volvalaad
name = "House Volvalaad standard"
desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \
They are known for their reformist ideals, and scientific prowess."
flag_path = "volvalaad"
/obj/structure/sign/flag/volvalaad
name = "House Volvalaad standard"
desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \
They are known for their Habsburgian inbreeding, reformist ideals, and scientific prowess."
icon_state = "volvalaad"
/obj/item/flag/kazkhz
name = "House Kazkhz standard"
desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \
Empire of Dominia. They are known for their conservative nature and aversion to augmentation."
flag_path = "kazkhz"
/obj/structure/sign/flag/kazkhz
name = "House Kazkhz standard"
desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \
Empire of Dominia. They are known for their conservative nature and aversion to augmentation."
icon_state = "kazkhz"
/obj/item/flag/caladius
name = "House Caladius standard"
desc = "A purple standard which represensts House Caladius, one of the great houses of the Empire of Dominia. They are \
known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists."
flag_path = "caladius"
/obj/structure/sign/flag/caladius
name = "House Caladius standard"
desc = "A purple standard which represensts House Caladius, one of the great houses of the Empire of Dominia. They are \
known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists."
icon_state = "caladius"
/obj/item/flag/zhao
name = "House Zhao standard"
desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of \
known for its naval officers and patronage of the Dominian shipbuilding industry."
flag_path = "zhao"
/obj/structure/sign/flag/zhao
name = "House Zhao standard"
desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of \
known for its naval officers and patronage of the Dominian shipbuilding and naval industries."
icon_state = "zhao"
/obj/structure/sign/flag/biesel
name = "Republic of Biesel flag"