Commit Graph

537 Commits

Author SHA1 Message Date
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
listerla
ebbea6ebc8 Ports more Teshari clothes from Urist & Citadel (#7488)
* Ports more Teshari clothes from Urist & Citadel

* Accidentally deleted one sprite, undeleting now
2020-08-20 22:16:42 -04:00
Rykka
c65b29e9fc Fixes Nanotrasen Uniforms to account for Solgov Path Changes
This was introduced thanks to a PR in mid-2019, and NT Sec/etc uniforms had been broken since then.

Screenshot of broken uniforms:
![](https://i.imgur.com/AVii80Z.png)

As of now, the in-hand sprite is the only one that's 'broken', display JSUIT on your sprite, but the actual UI in-hand works, the on-ground works, the on-mob works, so frankly, after two+ hours, I'm calling it good here.

This fixes all derivative NT uniforms too.
2020-08-18 12:09:11 -04:00
Atermonera
e79819146f Accessory colors aren't modified by clothing colors (#7435) 2020-08-12 21:31:56 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
Novacat
188eaf06a2 Update clothing.dm 2020-07-31 16:47:53 -04:00
Schnayy
f9c3cf616e Clothes, clothes, clothes! 2020-07-31 04:02:49 -04:00
Novacat
c4f7aed7f4 Merge pull request #8215 from dwinters99/spellcheck
Minor typo fixes
2020-07-27 01:55:24 -04:00
Novacat
9e72efca03 Update clothing.dm 2020-07-27 01:43:56 -04:00
Schnayy
4cf5f95991 Clothes! (And rats) 2020-07-22 06:13:29 -04:00
David Winters
1392eec74f Actually remembered to fill in the date
God, am I bad at this.
2020-07-07 13:58:14 -04:00
David Winters
ab10ff2f8c Removed drop pouches edit 2020-07-07 13:46:27 -04:00
David Winters
c909d1ab1b Revert "Minor typo fixes"
This reverts commit 0c3fa4743c.
2020-07-07 13:44:07 -04:00
David Winters
5bd37da557 VSEdit clothing.dm 2020-06-08 05:19:15 -04:00
David Winters
0c3fa4743c Minor typo fixes
Cowled vests aren't from the future anymore

W isn't a vowel anymore

De-russian'd syntax in webbing/drop-pouches description
2020-06-06 07:34:04 -04:00
Unknown
77e08765c7 Readds accidentally deleted thing 2020-05-28 14:09:46 -04:00
Unknown
dacacf8bc8 Localization updates 2020-05-28 14:06:21 -04:00
Aronai Sieyes
06a733e680 Merge pull request #8014 from VOREStation/upstream-merge-7184
[MIRROR] adds some coats for teshari + fancy clothes
2020-05-21 16:07:42 -04:00
Aronai Sieyes
22fe3bd4e4 Merge pull request #8002 from VOREStation/upstream-merge-7138
[MIRROR] Updates Solgov/Sifguard uniforms
2020-05-21 16:03:58 -04:00
Atermonera
20e8eb5b05 Merge pull request #7184 from Greenjoe12345/teshycoats
adds some coats for teshari + fancy clothes
2020-05-21 14:42:32 -04:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
Aronai Sieyes
0fe760d58f Add qipao description 2020-05-21 12:07:01 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
Unknown
08a336e582 Fixes a typo in pathing 2020-05-12 07:48:49 -04:00
Unknown
a74d890331 Repurposes Explorer Corp Uniforms
Repurposes the SEV Torch Explorer Corp uniforms into uniforms for the Nanotrasen Defense Force.
2020-05-10 14:44:15 -04:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493)
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
2020-04-29 19:59:03 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
45b67c5948 Merge pull request #7321 from KillianKirilenko/kk-collar
Colorable Collar/Choker Accessory
2020-04-27 10:56:08 -04:00
Killian
eb6420e9b8 choker customization! 2020-04-20 03:31:17 +01:00
Aronai Sieyes
209eb0e017 Port some random clothes 2020-04-18 19:41:54 -04:00
Killian
d5e344f178 colorable collar accessory 2020-04-18 18:18:37 +01:00
Unknown
6c01ab5b8f Adds Ascian's Medals
- Adds a Medal of Unity with two bronze stars for Ascian. Has its own sprite.
- Adds Ascian's Medal of Valor to loadout
- Refactors collars to be part of tie_vr in expected places.
2020-04-05 00:41:05 -04:00
Unknown
89d3a965f8 Ports a fix 2020-03-29 22:02:46 -04:00
Unknown
58f031cbf7 Converts webbing to Initialize 2020-03-29 16:17:34 -04:00
Atermonera
20a9f6463b Merge pull request #6853 from Neerti/holsters_and_webbing
Makes holsters and webbing get along.
2020-03-18 03:31:49 -04:00
Novacat
1602627443 Merge pull request #6643 from VOREStation/aro-detect
Add alternative detective wear
2020-03-01 10:54:03 -05:00
Novacat
b633165a08 Merge pull request #6673 from VOREStation/upstream-merge-6730
[MIRROR] Fixes sprites for Ablative & Bulletproof modular armour
2020-02-24 20:26:51 -05:00
Leshana
e7700b7af0 Fixed conflicts near a vorestation edit 2020-02-24 19:15:09 -05:00
Atermonera
ceae103174 Merge pull request #6730 from FenodyreeAv/TestBranch
Fixes sprites for Ablative & Bulletproof modular armour
2020-02-24 16:16:18 -05:00
Atermonera
16183867df Adds holster, lighter, and seatbelt sounds from World Server. 2020-02-24 16:12:37 -05:00
Aronai Sieyes
2a53830fa7 Add alternative detective wear 2020-02-21 13:46:49 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
81530b8c21 Merge pull request #6673 from Cerebulon/refixskirts
Fixes Jumpskirt Sprites
2020-02-08 14:02:30 -05:00
Novacat
f1394460c2 Merge pull request #6514 from VOREStation/upstream-merge-6651
[MIRROR] Ports Clothing Expansion Code from World Server
2020-02-04 11:21:37 -05:00
Atermonera
00f301d802 Merge pull request #6658 from Darlantanis/TeshariPonchoFix
Teshari Poncho Fix
2020-02-01 18:01:12 -05:00
Atermonera
1bc3ccf858 Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no
Hacky Fix for Athletic Shorts showing Missing Icon
2020-01-30 19:24:59 -05:00
Atermonera
130d942a2d Ports Clothing Expansion Code from World Server 2020-01-28 14:16:24 -05:00