# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
* Add files via upload
* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"
This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.
* Borrowing Ibnesquik's descriptions to fix this issue quickly.
So..blueshield in loadout wise is a mix of command and security gear.
So..i've (finally) added Blueshield Guard to anything that was restricted to either "security officer", or to the 'entire list of command staff'.
this allows BSG's to take holsters, Sec huds, and the PMC coats and all that, along with coats that are usually in sec/command only for loadout choices..
What this doesn't mean is you can take the hat that only the CD or HoS has. those are still locked. I specifically looked for the two above criteria for access restrictions.
This is something that was long due and forgotten about in the midst of everything else.
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.
* Adds 2 cowboy boots and a stick horse. yeehaw.
* Attempting to squash conflict that was caused by one of my OWN prs. For shame.
* attempting to fix conflict ft. anewbe
* General uniform update.
* Maps in bathrobe.
* Revert "Maps in bathrobe."
This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.
* Fixes cheongsams and maps in the bath robe.
* Removes unintentionally added sprite.
* Assorted bugfixes.
Peacoats: Requested.
Black corset/skirt combo: Requested.
Flower dress: First ss13 sprite I made, threw it in.
Red swept dress: A new, nicer red dress.
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
* Added 3 clothing sprites w/ appropriate ground/held sprites.
1, white yoga pants, intended to be any color.
2, white kimono, intended to be any color.
3, red and black jacket.
All intended to be in the loadout.
* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.
* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
- Port of all of the uniform items that we did not have.
- Aether, Sweater, Ward-T. Frontier, Focal, Heph. Grayson, M. Bill, PCRC outfits/uniforms ported. (Loadout, some restricted)
- All of the military jumpsuits and uniforms have been ported. (Not Avail).
- Plain utility outfits are available in the loadout, as well as the pt outfits (except for marine).
- Hazard, Sterile, Saare, and Confederate outfits ported. (Not Avail).
