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

Flag Fix 2 (#16432)

Browse Source 
* Flag Fix 2

  - rscadd: "Fixes Dominian flag structures being invisible. Not like any were mapped in to begin with, but better safe than sorry."

* damn

* fail-safe 2
This commit is contained in:
Wowzewow (Wezzy)
2023-06-05 22:36:17 +00:00
committed by GitHub
parent 94c86f37aa
commit 1e7c3ea540
2 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/flags_banners.dm
+18 -7
View File
@@ -30,9 +30,14 @@
var/icon/rolled_outline
var/unmovable = FALSE
/obj/structure/sign/flag/New(loc, var/newdir, var/linked_flag_path, var/deploy, var/icon_file)
/obj/structure/sign/flag/New(loc, var/newdir, var/linked_flag_path, var/deploy, var/icon_file, var/item_flag_path)
. = ..()
dir = newdir
if(!flag_path)
if(item_flag_path) // redundancy
flag_path = item_flag_path
else
flag_path = icon_state
if(!deploy)
switch(dir)
if(NORTH)
@@ -112,7 +117,7 @@
if(isfloor(user.loc))
user.visible_message(SPAN_NOTICE("\The [user] deploys \the [src] on \the [get_turf(loc)]."), SPAN_NOTICE("You deploy \the [src] on \the [get_turf(loc)]."))
user.drop_from_inventory(src)
new flag_structure(user.loc, user.dir, deploy = TRUE)
new flag_structure(user.loc, user.dir, deploy = TRUE, item_flag_path = flag_path)
qdel(src)
/obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent)
@@ -133,7 +138,7 @@
user.visible_message(SPAN_NOTICE("\The [user] fastens \the [src] to \the [A]."), SPAN_NOTICE("You fasten \the [src] to \the [A]."))
user.drop_from_inventory(src)
new flag_structure(user.loc, placement_dir)
new flag_structure(user.loc, placement_dir, item_flag_path = flag_path)
qdel(src)
@@ -715,21 +720,21 @@
/obj/item/flag/dpra
name = "\improper Democratic People's Republic of Adhomai flag"
desc = "The black flag of the Democratic People's Republic of Adhomai."
flag_path = "dpra"
desc_extended = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \
life. Opposing corporate claims on Tajaran soil and citing mismatched development and governmental negligence as the fault of humanity, they aim \
to \"free Tajara from the new shackles imposed upon them by the corporate overlords and return Adhomai to a free, prosperous planet like our ancestors dreamed of.\" They named the \
nation they were fighting for the Democratic People's Republic of Adhomai."
flag_path = "dpra"
flag_structure = /obj/structure/sign/flag/dpra
/obj/structure/sign/flag/dpra
name = "\improper Democratic People's Republic of Adhomai flag"
desc = "The black flag of the Democratic People's Republic of Adhomai."
flag_path = "dpra"
desc_extended = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \
life. Opposing corporate claims on Tajaran soil and citing mismatched development and governmental negligence as the fault of humanity, they aim \
to \"free Tajara from the new shackles imposed upon them by the corporate overlords and return Adhomai to a free, prosperous planet like our ancestors dreamed of.\" They named the \
nation they were fighting for the Democratic People's Republic of Adhomai."
flag_path = "dpra"
icon_state = "dpra"
flag_item = /obj/item/flag/dpra
@@ -775,12 +780,12 @@
/obj/structure/sign/flag/pra
name = "\improper People's Republic of Adhomai flag"
desc = "The tajaran flag of the People's Republic of Adhomai."
flag_path = "pra"
desc_extended = "Lead by President Njadrasanukii Hadii, the People's Republic of Adhomai are considered the 'loyalist' faction on Adhomai and enjoy galactic recognition as the \
government of Adhomai. It claims to be the true keeper of Al'mari's legacy. However, the PRA can be described as a Hadiist branch of Al'mari's revolutionary ideology - that means \
putting the State at the top of a hierarchy of power. The PRA is a very centralized state, but in recent years has slowly been able to start making true its promises to bring \
revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \
struggling to hold true to its radical ideals while an entrenched upper party stubbornly tries to hold onto power."
flag_path = "pra"
icon_state = "pra"
flag_item = /obj/item/flag/pra
@@ -826,12 +831,12 @@
/obj/structure/sign/flag/nka
name = "\improper New Kingdom of Adhomai flag"
desc = "The blue flag of the New Kingdom of Adhomai."
flag_path = "nka"
desc_extended = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \
Ruled by King Vahzirthaamro Azunja specifically, he denounces both other factions in the civil war as illegitimate and himself as the only legitimate ruler of Adhomai. \
Supporters of the New Kingdom tend to be rare outside lands it controls. However, they believe strongly that the current republic on Adhomai was founded on genocide and unspeakable \
slaughters. The New Kingdom puts forth the ideology that Republicanism is bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the \
ancient nobles and Republicans, and create a new noble dynasty."
flag_path = "nka"
icon_state = "nka"
flag_item = /obj/item/flag/nka
@@ -1079,6 +1084,7 @@
/obj/structure/sign/flag/diona
name = "\improper Imperial Diona standard"
desc = "A green Dominian standard which represents the Dionae within the Empire."
flag_path = "diona"
icon_state = "diona"
flag_item = /obj/item/flag/diona
@@ -1094,6 +1100,7 @@
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"
flag_path = "strelitz"
flag_item = /obj/item/flag/strelitz
/obj/item/flag/volvalaad
@@ -1107,6 +1114,7 @@
name = "\improper 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"
icon_state = "volvalaad"
flag_item = /obj/item/flag/volvalaad
@@ -1121,6 +1129,7 @@
name = "\improper House Kazhkz 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 = "kazhkz"
icon_state = "kazkhz"
flag_item = /obj/item/flag/kazhkz
@@ -1135,6 +1144,7 @@
name = "\improper House Caladius standard"
desc = "A purple standard which represents 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"
icon_state = "caladius"
flag_item = /obj/item/flag/caladius
@@ -1149,6 +1159,7 @@
name = "\improper House Zhao standard"
desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of the Empire of Dominia,\
known for its naval officers and patronage of the Dominian shipbuilding and naval industries."
flag_path = "zhao"
icon_state = "zhao"
flag_item = /obj/item/flag/zhao
html/changelogs/wezzy_flagfix2.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: Wowzewow(Wezzy)
# 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:
- bugfix: "Fixes Dominian flag structures being invisible. Not like any were mapped in to begin with, but better safe than sorry."