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.

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

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
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 = "solarian army 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
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 = "solarian army 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 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 with peacekeepers on the former capital of the Restoration Front - Lycoris."
icon_state = "sapk"
item_state = "sapk"
58 changes: 58 additions & 0 deletions html/changelogs/ShimmerIsTaken-ununun.yml
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
Binary file not shown.
Loading