Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds a Solarian army peacekeeper beret to the loadout. #20129

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+71 −0
Open

Adds a Solarian army peacekeeper beret to the loadout. #20129

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25870e0
peacekeeping
shimmeristaken Oct 31, 2024
bb6e180
peacekeeping continues
shimmeristaken Oct 31, 2024
3608f69
objective peacekeeping
shimmeristaken Oct 31, 2024
c4ff3dc
factional
shimmeristaken Oct 31, 2024
a8b4624
loadout item
shimmeristaken Oct 31, 2024
43dff61
this is why we playtest people
shimmeristaken Oct 31, 2024
1615cfa
changelog
shimmeristaken Oct 31, 2024
818d7ce
changes name and shifts description a little
shimmeristaken Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/client/preference_setup/loadout/items/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,10 @@
display_name = "artist beret"
path = /obj/item/clothing/head/beret/artist/colourable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

/datum/gear/head/peacekeeper
display_name = "army peacekeeper beret"
path = /obj/item/clothing/head/beret/sapk
/*
Block Hair Adjustment
*/
Expand Down
9 changes: 9 additions & 0 deletions code/modules/clothing/head/berets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,12 @@
desc = "A black beret adorned with the crest of an ERT detachment. Worn by commanders of NanoTrasen response teams."
icon_state = "centcomcaptain"
item_state = "centcomcaptain"

// Factional

/obj/item/clothing/head/beret/sapk
name = "peacekeeper beret"
desc = "A sky-blue Army beret with a white trim, proudly displaying a golden emblem of the Alliance."
desc_extended = "While a common sight in the Alliance's more rebellious or devastated worlds such as Mars, the Army peacekeeper beret became a potent symbol of Sol's triumph in the civil war. Nowhere else in the Spur are the blue berets more omnipresent than the former capital of the Restoration Front - Lycoris."
Copy link
Contributor

@DreamySkrell DreamySkrell Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Searching "peacekeeper" on the wiki just shows me peacekeeper mandate (biesel faction), so it's just going to be confusing if this beret is referencing a similarly named solarian faction that's not actually in lore. There shouldn't be lore items in the loadout that aren't connected to actual lore on the wiki. Lycoris doesn't even have its own wiki page and its only referenced by name in a couple of other pages.

If it's not in the wiki, then there's no way in game to determine if the item is headcanon or an actual thing in lore.

Why would any crew wear this on horizon? Why would it be allowed by SCC? Especially with the bit of the Army peacekeeper beret became a potent symbol of Sol's triumph in the civil war. Biesel and corporations don't really like sol, and this is a beret of a military force that's (I assume) still active.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also generally not a fan of more and more military gear or uniforms being added to the loadout.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but the problem is that it doesn't really match the color scheme of any of the existing Solarian clothes in sol_uniforms.dmi. It looks like a PMCG beret more than anything else.

It utilizes colors of the Solarian flag, white, blue, gold.

image

It is absolutely true that this is the odd one out- but that's on purpose. It's supposed to stand out and be recognizable, as well as add Sol's chief colors to their available military's color scheme. Currently what you have is grey, olive green, black and white, red, which are very common colors throughout any uniform in the setting.

Searching "peacekeeper" on the wiki just shows me peacekeeper mandate (biesel faction), so it's just going to be confusing if this beret is referencing a similarly named solarian faction that's not actually in lore. There shouldn't be lore items in the loadout that aren't connected to actual lore on the wiki. Lycoris doesn't even have its own wiki page and its only referenced by name in a couple of other pages.

image

image

https://forums.aurorastation.org/topic/2816-sol-alliance-news-network/?do=findComment&comment=177608

Peacekeeping isn't a term exclusive to Biesel, and has been used to reference Solarian forces in lore pages. The arc is still ongoing and as such not everything related to it will be present on the wiki.

I've discussed this with Schwann and he told me it makes sense to be added.

I can rename it to 'Solarian Army Beret', and leave mention of it's use by Solarian peacekeepers in the extended description if that's preferable to how it is now.

Why would any crew wear this on horizon? Why would it be allowed by SCC? Especially with the bit of the Army peacekeeper beret became a potent symbol of Sol's triumph in the civil war. Biesel and corporations don't really like sol, and this is a beret of a military force that's (I assume) still active.

The SCC already allows people to display not only the Solarian flag in their departments, but the flags of Himeo and Pluto, which are far more overtly hostile to the SCC. Himeo outright executes it's people who affiliate with Hephaestus, yet not only are Himean voidsuit modkits allowed, you can also wear their flagpatch on your person.

Same with Pluto, you can be a card carrying member of a communist party, wear it's flagpatch, display it's flag, you can visually be a literal communist.

I don't see how a beret belonging to an occupational / garrison force that has never come into conflict with the SCC would push them to forbid it over things I've mentioned above.

Copy link
Contributor

@DreamySkrell DreamySkrell Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SCC already allows people to display not only the Solarian flag in their departments, but the flags of Himeo and Pluto, which are far more overtly hostile to the SCC.

A nation's flag is VERY different from a beret of an active military force.

I don't see why SCC would allow the crew to wear gear from active military forces (that aren't corporate (like PMCG) or biesel aligned (like TCAF)).

And I don't see why any crew would want to wear gear from such active military forces. They work for SCC or the other megacorps, and can't be active sol army soldiers or whatever at the same time.

icon_state = "sapk"
item_state = "sapk"
58 changes: 58 additions & 0 deletions html/changelogs/ShimmerIsTaken-ununun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: ShimmerIsTaken

# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added a Solarian army peacekeeper beret to the headgear loadout option."
Binary file modified icons/obj/clothing/hats/berets.dmi
View file
Open in desktop
Binary file not shown.
Loading