Commit Graph

81 Commits

Author SHA1 Message Date
Killian 4a87ed01fa Laserdome Update (#19233)
* laserdome update

* Update laserdome.dmm

fix double bench in ffa readyroom

* Update laserdome.dmm

expand laserdome shops

* Update laserdome.dmm

update the other shop, too

* Update laserdome.dmm

fix the big block windows

* Fixup maps in TGM format

529ec4ec2a: maps/redgate/laserdome.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Update laserdome.dmm

fix duplicate rack

* laserdome: tdm content for ffa arena

* Fixup maps in TGM format

529ec4ec2a: maps/redgate/laserdome.dmm

Automatically commited by: tools\mapmerge2\fixup.py
2026-02-27 13:57:46 -05:00
Cameron Lennox b36e238cd1 Cleaned up every clothing item to use defined pocket lists #35 (#17235)
* cleaned up every clothing item to use defined pocket lists

* oop, changeling armor weird

* invalid prybar

* allow any emergency tank, for non-oxy breathers

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
2025-03-12 16:32:55 -04:00
Cameron Lennox 6a157d8614 Rig glovefix and Clothing protection fix (#17118)
* Fixes RIG gear to not drop your equipped items

Fixes the rig gear to not drop your equipped gear after undeployment

* better fix

* Fixes suits and RIGS

- Makes rigsuits no longer eat your gloves
- Allows you to properly wear a ring under a rigsuit
- Gets rid of a LOT of duplicate var  = XYZ in places
- Makes it so clothing actually properly provide protection to the areas they're covering. (This doesn't change anything unless their actual min_cold_protection or max_heat_protection is adjusted!)
- Adds a define for CHEST which is just UPPER_TORSO|LOWER_TORSO to make it clear it's protecting your WHOLE chest at a glance.
- Gives some things like knee-high and thigh-high boots proper leg protection

* Clothing unit test

* fixes

* oops

* hoods are snowflakes

* hood fix

* path fix

* no nullspace turf

* nullcheck

* don't test devwarning cloths

* ignore this too

* more exclusions

* more exclusions, disabled species test

* Changes So Far

* holding/wearing icons for clothing

* fixed

* more fixes

* lets try this again

* go

* tesh cloak

* some more

* devwarning

* the cursed one

* oops

* fixed species scan

* Update clothing.dm

* restrict this down a bit more, we don't want unit-test to choke

* no more CI killer

* suit defined name twice

* suit

* some more exclusions

* etc

* gwah

* gwah

* clarifying exclusions

* yet more exclusions

* another set of exclusions

* ranger

* compile

* more bitflag

* yet more exclusions

* more

* more missing

* Update sifguard.dm

comment (also to wake up travis)

* more exclusions

* sifguard

* more exclusions

* more

* send help, yes more exclusions

* lost to time

* skrell stuff

* offear is special

* fixes more and unbreaks protean rigs

* The big one

* wrong ifdef

* more

* boots

* Update accessory.dm

* small object fix

* lets be more careful

* Does this fix the signal

* is it the signal?

* FIXES THE REST OF THEM

* wah

* disable test

* the last one

* fix signal check

* fixes

* ignore storage

* teshari blacklist

* tesh

* God speed

* fixed progression removed lizard

* fixes some i guess but what's the point

* disable indepth check

* START ROBOT SPRITE VALIDITY

* Revert "START ROBOT SPRITE VALIDITY"

This reverts commit c9bfb7e9ce.

* consistency with another test

* yuh uh

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
2025-03-01 11:56:30 -05:00
Kashargul b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
dan 92da6db226 yet another clothing port pr (#16105)
* loadout additions

* forgot a comma

* i forgor something

---------

Co-authored-by: PastelPrinceDan <amayahsslut@gmail.com>
2024-07-21 19:56:01 +10:00
Drathek 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
Hatterhat 9176d32723 dinglestry baby 2023-02-07 15:42:55 -06:00
Hatterhat 29004983ea works on my machine 2023-02-05 04:22:55 -06:00
Flump 5889cbcb4f i forgor 2023-02-03 05:37:59 +00:00
Detective-Google e9d3d3e5fa formatting
was missing a space
2023-01-01 08:28:05 -06:00
Detective-Google 5858507b44 adds halos 2023-01-01 08:24:37 -06:00
klaasjared 98636f4e68 Laser Tag Revamp/Additions
Laser Tag Revamp/Additions 2
Laser Tag Revamp/Additions
Update toy.dm
2022-02-18 02:53:17 -05:00
klaasjared 2c312f71a0 Ruin Marine 2022-02-17 21:04:05 -05:00
klaasjared 56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
Ghost Actual 4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
Aronai Sieyes b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Atermonera a8409a3e1e Yet another clothing PR 2021-03-10 14:30:44 -05:00
Cerebulon 4fc2884f9f Excised Errant Bay Military Lore (#7810)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Update filth.dm

why was this here oops i was on master
2021-01-01 00:40:56 -05:00
Schnayy 8f9edf0e57 5 new clothes & 1 headdress (#7733) 2020-10-17 06:15:54 -04:00
Cerebulon 95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Unknown 4792fc1693 Conflict Resolution 2019-03-28 20:44:59 -04:00
Neerti 15e3c04ca3 Nock masks, cowls & robes 2019-03-28 20:42:42 -04:00
Cerebulon 0be6662dc5 Adds 12 new futuristic loadout clothing items + colour variants 2018-12-06 16:17:20 -05:00
Anewbe 4d696241fa Merge pull request #5349 from Woodratt/WR6112018_clothingfix
Clothing Bug Fixes
2018-06-14 10:54:14 -04:00
Schnayy 36236e1883 Sivian Western Sprite Pack (#4970)
* 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
2018-02-27 14:24:20 -06:00
Belsima 0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Verkister 26ea6ec92d Enables the combo blend mode for most colorable loadout gear.
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
2017-11-02 15:33:52 +02:00
Cyantime bf60030b6b Fixes loadout flat cap having no icon 2017-07-27 23:25:28 -04:00
Anewbe 27b1db523e Wooden circlets can now be worn as hats 2017-04-01 15:31:06 -05:00
Schnayy 0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Schnayy 971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Anewbe 81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
nachomeep 9d3aba5832 Fixes blockheadhair tag. 2017-02-25 09:49:24 -05:00
woodratt 6dd5c9d657 1.6.4 Port of Baystation head items.
- Port of baystation head slot items. Some in hand sprites created for a few (soft caps). A couple other sprites adjusted so they fit more hairstyles.

- Sol berets. (Loadout)
- Baseball caps, major bills, sol, fleet, expeditionary (Loadout)
- helmets, merc, tact, sol, nt. (Not Avail)
- Utility, wheelcaps, garrison, drill, dress. (Not Avail)
- Resprites for the detective's fedoras.
- Four custom welding hoods, (Loadout, access restricted).
- Two new cowboy hats, taken from Europa code. (Loadout)
2016-11-26 15:57:15 -08:00
redstryker 469082aa59 Head Item Additions and Changes 2016-11-21 17:00:23 -05:00
Anewbe 9664e09ae7 Turban doesn't cover beard 2016-11-08 20:43:54 -06:00
woodratt 3915842f7b Trenchcoats and more
- Added unarmored versions of the grey and brown trenchcoats to the loadout.
- Added their accompanying fedoras as well.
- Added a unarmored variant of the 'gentlemen's coat' to the loadout as well, called grey jacket.
2016-09-25 23:40:28 -07:00
Spades 9c78d6a2a1 Naming inconsistencies fixed
The short naming of central command has been really inconsistent across
the game's files. This has always annoyed the shit out of me.

CentComm and Centcomm and Centcom are now all CentCom, specifically with
that capitalization. Why one M instead of two M's? Because Comm with two
'M's = Communications. Hence, Telecomms, NOT Telecoms. Telecoms is
incorrect. CentCom was also chosen because CentCom with one M and this
casing is most found throughout the game's files.

Speaking of Telecomms, I corrected one instance in the game where it's
Telecom. Like I said, this is not correct. There was only one
inconsistency.

Likewise, Nanotrasen has been changed to NanoTrasen. Nanotrasen only
appears 20 times, where NanoTrasen appears 62. NanoTrasen is clearly the
preferred, correct naming.
2016-09-13 16:36:43 -04:00
redstryker 805d90536f Adds an in-hand 2016-09-02 17:27:07 -04:00
redstryker 09e9451dd5 Fixed Error 2016-09-02 15:03:04 -04:00
redstryker 1e3017365d Flat Cap Changes and Hair Bow 2016-09-02 14:54:26 -04:00
redstryker c98218bc08 Sombrero Code 2016-09-01 11:07:07 -04:00
redstryker d48e7c59cc Headgear Additions, and an Undershirt 2016-08-31 19:04:21 -04:00
SinTwo 279cbdfafe more icon fixes 2016-08-03 14:10:29 -04:00
redstryker 97f9cd3fb2 Adds Customs Clothes, Vests, and Sweaters, Oh My! 2016-08-01 14:11:40 -04:00
SinTwo b4bb348e01 clothing mob sprites fix 2016-07-23 23:49:57 -04:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00