Commit Graph

26 Commits

Author SHA1 Message Date
Christasmurf d587effe2c Beret + softcap .dmi split (#25314)
* beret softcap dmi split

* icon rename

* dme crlf to lf

* tsf cap fixes

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>

* vox cap icon name

* remove beret subtype on fluff

* Update code/modules/clothing/head/soft_caps.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-02 11:37:44 +00:00
GDN 9e6dcf9c46 removes the remaining datum redeclares (#25220)
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
2024-04-21 18:26:35 +00:00
CRUNCH d49d9d5189 Soap is no longer comdom scented. Collectable captain hat doesn't look like a comdom hat. (#24661)
* no comdoms

* Update code/game/objects/items/weapons/soap.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-03-27 05:54:48 +00:00
Henri215 dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
ElorgRHG 08a9b19d19 Paradise's soul removal part 2.5: rest of security (#19522)
* Security suit resprite

* Map in security variants of riot and bulletproof armors

* Security hats resprite

* Security belt and webbing resprite

* Blue warden by default because why not

* Very tiny (literally one pixel) tweak to the HoS trenchcoat

* Security riot suit in the name

* Small armor with badge oopsie

* Vox suit and hat variants

* Species variants of new security suits and helmets

* Deconflicted

* Deconflicted again

* Forgot about the warden's beret existance

* Deconflicted suits part two

* Blueshield armor too because it would look out of place otherwise

* Deconflicted belts

* Accidental duplicate I'll fix here
2022-11-22 16:51:26 -05:00
Henri215 91ca64c465 fix collectable welding helmet (#19155) 2022-09-29 20:42:39 +01:00
ElorgRHG e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891)
* 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
2022-09-17 11:13:58 +01:00
Octus b8cf8fa091 Vox Hats! (#18835) 2022-08-24 15:58:47 +01:00
Adri bad1ec7aa2 Adds vox variants to bee costume and mask, captain hat, cult armor and helmet, medical beret (#18671)
* Fixes some misaligned vox clothing

* Adds missing declarations, adds tail to cult armor
2022-08-05 20:35:18 +01:00
Adri 18a440a9bb Adjusts 15 berets and 9 other pieces of headwear to properly fit vox heads, part 1 (#18221)
* Chef hat fix

* Revert "Chef hat fix"

This reverts commit 645d08afdd.

* Alphabetizes vox head icons

* Repositions, recolors, and fixes vox headwear

* Adds code so the headgears actually show up

* Adds blockhair flag to bandana

* Revert "Adds blockhair flag to bandana"

This reverts commit ca47ba5000.

* Removes bandana vox code

* Removes the bandanas, will be done in another PR

* Removed superfluous sprite sheet declarations

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/customitems/item_defines.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-16 15:24:00 -05:00
variableundefined 188496c678 Merge pull request #16595 from SabreML/clothing-migration
[IDB IGNORE] Clothing .dmi file organisation
2021-09-01 19:44:59 -05:00
TheYeetster1 422e033d59 Adds 3 new names when a hardhat is put on a corgi (#16553)
* Hardhats

* Fixes relative path

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-08-25 15:57:16 +01:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Mark van Alphen 90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
KasparoVy aa4e1eb970 Sharing is Caring: Masks Galore
Adds Vox versions of the Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer.

Adds versions of the following, re-sprited to fit Unathi, Tajara and Vulpkanin:

    Balaclava, up and down state
    All bandana colours (+ skull pattern), up and down states
    Breath mask, up and down state
    Clown mask+wig
    Cyborg mask
    Death Commando mask
    Gas mask
    All wrestling masks
    Medical mask, up and down state
    Mime mask
    Owl mask
    Plague doctor mask
    Ninja mask
    Sechailer, up and down state
    Sexy Clown mask+wig
    Sexy Mime mask+wig
    Sterile/Surgical mask, up and down state
    SWAT mask
    Welding gas mask, visor up and down state
    Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer
    All smokeables re-positioned so non-humans aren't smoking through their cheek.

Also fixes some typos, does a tiny bit of cleaning and gives the Warden their sechailer.
The sprite was just laying around, it seems.
2016-02-01 17:49:37 -05:00
Fox-McCloud 8c67b24506 Code Cleanup 2015-10-17 05:58:37 -04:00
KasparoVy be61b0d4e4 Implementation of the new Sprites 2015-08-30 01:00:44 -04:00
Erthilo 6443216183 More Vox clothing. Head and eyes this time.
Conflicts:
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox/head.dmi
	icons/mob/species/vox/suit.dmi
2014-06-15 06:51:14 -04:00
Vincent 7b58cc04b2 Gives mobs a "fall" proc for the transition between falling and standing. This is not for the rotation code, which occurs on both falling and rising.
Adds a variable to hats to determine how likely they are to fall off.  Makes them fall off with the given probability when disarmed (some percentage of the time) or when the character falls.  Space helmets, bio hoods, helmets, radiation helmets, etc, are unlikely to fall off

Conflicts:
	code/game/gamemodes/cult/cult_items.dm
	code/modules/clothing/clothing.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/head/jobs.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/tgevents/holiday/xmas.dm
	code/modules/mob/mob.dm
2014-01-24 00:16:46 -05:00
Kortgstation@gmail.com 0c4f441cb5 Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +00:00
johnsonmt88@gmail.com e9671308bf Reorganized clothing as a whole.
Everything related to clothing should now be defined in modules/clothing. I'm almost certain there's clothing code hidden elsewhere but this should be the vast majority of it finished.

Everything is set up related to the object types themselves (meaning paths.)
So all hats will be in modules/clothing/head, all gloves will be in modules/clothing/gloves, ect...

I've removed 'modules/clothing/random.dm' and 'objects/items/clothing.dm' which both seemed to just be a place where people would put stuff they were too lazy to find a proper home for.

I've also moved files that had no, or very few blocks of code into more catagorized areas.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4388 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-13 02:17:14 +00:00