Skip to content

Commit

Permalink
flag on the play
Browse files Browse the repository at this point in the history
  • Loading branch information
CampinKiller24 committed Nov 28, 2023
1 parent 2ff5ec4 commit 8c50a19
Show file tree
Hide file tree
Showing 4 changed files with 237 additions and 0 deletions.
186 changes: 186 additions & 0 deletions code/game/objects/structures/flags_banners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2274,6 +2274,192 @@
/obj/structure/sign/flag/luna/large/west/Initialize(mapload)
. = ..(mapload, WEST)

//Persepolis

/obj/item/flag/persepolis
name = "\improper Persepolis flag"
desc = "The flag of Persepolis. MORE DESCRIPTION HERE."
flag_path = "persepolis"
flag_structure = /obj/structure/sign/flag/persepolis

/obj/structure/sign/flag/persepolis
name = "\improper Persepolis flag"
desc = "The flag of Persepolis. MORE DESCRIPTION HERE."
flag_path = "persepolis"
icon_state = "persepolis"
flag_item = /obj/item/flag/persepolis

/obj/item/flag/persepolis/l
name = "large Persepolis flag"
flag_size = TRUE
flag_structure = /obj/structure/sign/flag/persepolis/large

/obj/structure/sign/flag/persepolis/large
icon_state = "persepolis_l"
flag_path = "persepolis"
flag_size = TRUE
flag_item = /obj/item/flag/persepolis/l

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

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

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

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

//Damascus

/obj/item/flag/damascus
name = "\improper Damascus flag"
desc = "The flag of Damascus. MORE DESCRIPTION HERE."
flag_path = "damascus"
flag_structure = /obj/structure/sign/flag/damascus

/obj/structure/sign/flag/damascus
name = "\improper Damascus flag"
desc = "The flag of Damascus. MORE DESCRIPTION HERE."
flag_path = "damascus"
icon_state = "damascus"
flag_item = /obj/item/flag/damascus

/obj/item/flag/damascus/l
name = "large Damascus flag"
flag_size = TRUE
flag_structure = /obj/structure/sign/flag/damascus/large

/obj/structure/sign/flag/damascus/large
icon_state = "damascus_l"
flag_path = "damascus"
flag_size = TRUE
flag_item = /obj/item/flag/damascus/l

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

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

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

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

//Medina
/obj/item/flag/medina
name = "\improper Medina flag"
desc = "The flag of Medina. MORE DESCRIPTION HERE."
flag_path = "medina"
flag_structure = /obj/structure/sign/flag/medina

/obj/structure/sign/flag/medina
name = "\improper Medina flag"
desc = "The flag of Medina. MORE DESCRIPTION HERE."
flag_path = "medina"
icon_state = "medina"
flag_item = /obj/item/flag/medina

/obj/item/flag/medina/l
name = "large Medina flag"
flag_size = TRUE
flag_structure = /obj/structure/sign/flag/medina/large

/obj/structure/sign/flag/medina/large
icon_state = "medina_l"
flag_path = "medina"
flag_size = TRUE
flag_item = /obj/item/flag/medina/l

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

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

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

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

//Aemaq
/obj/item/flag/aemaq
name = "\improper Aemaq flag"
desc = "The flag of Aemaq. MORE DESCRIPTION HERE."
flag_path = "aemaq"
flag_structure = /obj/structure/sign/flag/aemaq

/obj/structure/sign/flag/aemaq
name = "\improper Aemaq flag"
desc = "The flag of Aemaq. MORE DESCRIPTION HERE."
flag_path = "aemaq"
icon_state = "aemaq"
flag_item = /obj/item/flag/aemaq

/obj/item/flag/aemaq/l
name = "large Aemaq flag"
flag_size = TRUE
flag_structure = /obj/structure/sign/flag/aemaq/large

/obj/structure/sign/flag/aemaq/large
icon_state = "aemaq_l"
flag_path = "aemaq"
flag_size = TRUE
flag_item = /obj/item/flag/aemaq/l

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

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

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

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

//New Suez
/obj/item/flag/newsuez
name = "\improper New Suez flag"
desc = "The flag of New Suez. MORE DESCRIPTION HERE."
flag_path = "newsuez"
flag_structure = /obj/structure/sign/flag/newsuez

/obj/structure/sign/flag/newsuez
name = "\improper New Suez flag"
desc = "The flag of New Suez. MORE DESCRIPTION HERE."
flag_path = "newsuez"
icon_state = "newsuez"
flag_item = /obj/item/flag/newsuez

/obj/item/flag/newsuez/l
name = "large New Suez flag"
flag_size = TRUE
flag_structure = /obj/structure/sign/flag/newsuez/large

/obj/structure/sign/flag/newsuez/large
icon_state = "newsuez_l"
flag_path = "newsuez"
flag_size = TRUE
flag_item = /obj/item/flag/newsuez/l

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

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

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

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

// Hive Zo'ra

Expand Down
10 changes: 10 additions & 0 deletions code/modules/client/preference_setup/loadout/items/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@
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, Persepolis"] = /obj/item/flag/persepolis
banners["banner, Damascus"] = /obj/item/flag/damascus
banners["banner, Medina"] = /obj/item/flag/medina
banners["banner, Aemaq"] = /obj/item/flag/aemaq
banners["banner, New Suez"] = /obj/item/flag/newsuez
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 @@ -248,6 +253,11 @@
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, Persepolis"] = /obj/item/flag/persepolis/l
flags["flag, Damascus"] = /obj/item/flag/damascus/l
flags["flag, Medina"] = /obj/item/flag/medina/l
flags["flag, Aemaq"] = /obj/item/flag/aemaq/l
flags["flag, New Suez"] = /obj/item/flag/newsuez/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
41 changes: 41 additions & 0 deletions html/changelogs/CampinKiller24-serene.yml
Original file line number Diff line number Diff line change
@@ -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: CampinKiller24

# 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 the new Elyran flags."
Binary file modified icons/obj/structure/flags.dmi
Binary file not shown.

0 comments on commit 8c50a19

Please sign in to comment.