* Adds le hats
* kidan hat fitting
* tan hat existence restoration
* run you POS icondiffbot
* attempt 2
* Cargo hat emblem recolor
* bluespace? more like WHITESPACE
* plushies4all
* adds redescriptioning
* geartweak vars
* marks uniform
* updates general
* sorry you can't edit racial items
* Revert "marks uniform"
This reverts commit c738baa29a.
* black tango dress
* forgot jorts
* the cone beckons
* we love good comments
* missed some periods
* what do you mean i missed a placeholder
* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
* code and icons
* file renaming
* vendor prices, apron/overalls obj icons, species sprites
* species head sprites because thats a thing
* loadout inconsistencies fix
* vox have their own apron and overalls sprites so i added those. oh the lengths i go for you botany
* loadout 2: return of the inconsistencies
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
* maybe fixes merge conflict?
* merge conflicts are so annoying holy shit
* sick of this dme junk
* remove unrelated change
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
* merge conflict test fix
* super merge conflict fix
* fix drask syndiberet
* actually fixes drask syndiberet
* super ultra final beret fix
* Update loadout_uniform.dm
---------
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Give Paramedic a medical beret
* Change path of Wardens' beret
* Give HOS and Warden loadout berets
* removes Barber from Service Armbands
* Gives Captain Procedure Armband
They are technically a Head of Procedure
* Gives Explorer Cargo Armband
* Gives Geneticist Research and Medical berets
* Gives Geneticist Research and Medical armbands
* Gives Virologist Medical armband
* Gives Detective Security beret
* Gives Shaft Miner Cargo beret
* Gives Explorer Cargo beret
* Gives Geneticist Research and Medical winter coats
* Gives CMO EMT armband
they can have EMT labcoat, they are trained professional, why not?
* Gives Geneticist Research and Medical bomber jackets
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
* The sprites and stuff
* Vox re-add
* Why did I do this
* Last tweaks
* Pixel differences
* I have decided that captains need a beret
* I have decided that Ian needs drip too
* This exists sadly
* I forgor the gloves 💀
* CONFLICTSSSSSS
* "empty" commit
* White tunic
I don't get the appeal still
* bluE
* Painful
This will most likely get closed anyway so whatever
* OLD TUNICCCCCCCCC
* Conflicts
* Loadout captain's berets
* More conflicts, yay
* `display_name` -> Typepaths V1
* Loadout display name capitalisation
#15857
* Review 1, plus json fixes
* (Hopefully) final tweaks
* Styling nitpicks
* Extra tweaks because why not
It never caused a runtime, but the `?.` is just in case.
* Deconflicting
* Warning comment
* Whoops
Typing faster than my brain
* adds a wide varriety of new loadout options and some minor cost adjustments
* forgot to enable the vox plushie
* Removed the contravercial items and added camera, kilt, and lizard plushie as choices
* Deconflicted and the unwanted items removed
Removes the purple hair flower pin, as this is my fluff item.
@Tigercat2000 is moving the sprite to the correct folder then he's available.
:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
Ahzpy