Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Commit

Permalink
Adds Lunan flag sprites (Aurorastation#17682)
Browse files Browse the repository at this point in the history
* Adds Lunan flag sprites

* Update accent_tags.dmi

* Update lunanflag.yml
  • Loading branch information
listerla authored Nov 13, 2023
1 parent 80adbb7 commit 8041bfa
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 0 deletions.
39 changes: 39 additions & 0 deletions code/game/objects/structures/flags_banners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2236,6 +2236,45 @@
/obj/structure/sign/flag/silversun/large/west/Initialize(mapload)
. = ..(mapload, WEST)

// Luna

/obj/item/flag/luna
name = "\improper Lunan flag"
desc = "The flag of Luna. The crescent represents Luna itself, and is meant to remind viewers of Selene's headpiece."
flag_path = "luna"
flag_structure = /obj/structure/sign/flag/luna

/obj/structure/sign/flag/luna
name = "\improper Lunan flag"
desc = "The flag of Luna. The crescent represents Luna itself, and is meant to remind viewers of Selene's headpiece."
flag_path = "luna"
icon_state = "luna"
flag_item = /obj/item/flag/luna

/obj/item/flag/luna/l
name = "large Lunan flag"
flag_size = TRUE
flag_structure = /obj/structure/sign/flag/luna/large

/obj/structure/sign/flag/luna/large
icon_state = "luna_l"
flag_path = "luna"
flag_size = TRUE
flag_item = /obj/item/flag/luna/l

/obj/structure/sign/flag/luna/large/north/Initialize(mapload)
. = ..(mapload, NORTH)

/obj/structure/sign/flag/luna/large/south/Initialize(mapload)
. = ..(mapload, SOUTH)

/obj/structure/sign/flag/luna/large/east/Initialize(mapload)
. = ..(mapload, EAST)

/obj/structure/sign/flag/luna/large/west/Initialize(mapload)
. = ..(mapload, WEST)


// Hive Zo'ra

/obj/item/flag/zora
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@
flagpatch_national["flagpatch, silversun"] = /obj/item/clothing/accessory/flagpatch/silversun
flagpatch_national["flagpatch, callisto"] = /obj/item/clothing/accessory/flagpatch/callisto
flagpatch_national["flagpatch, venus"] = /obj/item/clothing/accessory/flagpatch/venus
flagpatch_national["flagpatch, luna"] = /obj/item/clothing/accessory/flagpatch/luna
flagpatch_national["flagpatch, konyang"] = /obj/item/clothing/accessory/flagpatch/konyang
flagpatch_national["flagpatch, elyra"] = /obj/item/clothing/accessory/flagpatch/elyra
flagpatch_national["flagpatch, coalition"] = /obj/item/clothing/accessory/flagpatch/coalition
Expand Down
2 changes: 2 additions & 0 deletions code/modules/client/preference_setup/loadout/items/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
banners["banner, Mictlan"] = /obj/item/flag/mictlan
banners["banner, New Hai Phong"] = /obj/item/flag/nhp
banners["banner, Silversun"] = /obj/item/flag/silversun
banners["banner, Luna"] = /obj/item/flag/luna
banners["banner, Hive Zo'ra"] = /obj/item/flag/zora
banners["banner, Hive K'lax"] = /obj/item/flag/klax
banners["banner, Hive C'thur"] = /obj/item/flag/cthur
Expand Down Expand Up @@ -246,6 +247,7 @@
flags["flag, Mictlan"] = /obj/item/flag/mictlan/l
flags["flag, New Hai Phong"] = /obj/item/flag/nhp/l
flags["flag, Silversun"] = /obj/item/flag/silversun/l
flags["flag, Luna"] = /obj/item/flag/luna/l
flags["flag, Hive Zo'ra"] = /obj/item/flag/zora/l
flags["flag, Hive K'lax"] = /obj/item/flag/klax/l
flags["flag, Hive C'thur"] = /obj/item/flag/cthur/l
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/suits/modular_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,12 @@
icon_state = "flagpatch_venus"
item_state = "flagpatch_venus"

/obj/item/clothing/accessory/flagpatch/luna
name = "luna flagpatch"
desc = "A flagpatch representing Luna. The crescent represents Luna itself, and is meant to remind viewers of Selene's headpiece."
icon_state = "flagpatch_luna"
item_state = "flagpatch_luna"

/obj/item/clothing/accessory/flagpatch/coalition
name = "coalition flagpatch"
desc = "A flagpatch representing the Coalition of Colonies. Although used on many Coalition worlds, this flag has also come \
Expand Down
6 changes: 6 additions & 0 deletions html/changelogs/lunanflag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
author: Pirouette, StevIII

delete-after: True

changes:
- imageadd: "Added a Lunan banner, flag, and flagpatch to loadout."
Binary file modified icons/clothing/kit/modular_armor_accessories.dmi
Binary file not shown.
Binary file modified icons/obj/structure/flags.dmi
Binary file not shown.

0 comments on commit 8041bfa

Please sign in to comment.