More scarfs #216
Merged
More scarfs #216
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Doesn't include into quickthreads or other clothing vendors
I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk
|
RSI Diff Bot; head commit 16ae1e5 merging into 55be333 Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/ace.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/aro.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/bi.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/inter.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/lesbian.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/non.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/pan.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/rainbow.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/Pride_Scarfs/trans.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/lightorange.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/pink.rsi
Resources/Textures/_CD/Clothing/Neck/Scarfs/white.rsi
|
Nairodian
reviewed
Apr 7, 2024
|
Starting to think at this point we should just add the pridevend tbh |
PursuitInAshes
added a commit
to PursuitInAshes/cosmatic-drift
that referenced
this pull request
Apr 21, 2024
commit 14b319bb6e4211eea0412587560debe28fe44135 Author: Pizzy0 <[email protected]> Date: Tue Apr 16 22:55:02 2024 -0500 Headslime Variants (#223) commit 2a8f4453a094a7b488d997293dc405da7a5b32a8 Merge: 07f36b7838 fc7c0c0d60 Author: LankLTE <[email protected]> Date: Tue Apr 16 20:51:01 2024 -0700 Merge Upstream 16/4/24 (#224) commit fc7c0c0d60efdd10be40ac69f9fa46bd38b3d3df Merge: 835077b5ca fff3fe2a24 Author: LankLTE <[email protected]> Date: Tue Apr 16 19:08:24 2024 -0700 squash! Merge tool integrating fff3fe2a2461dfc61333b1875f8c5b7a9537c9e0 commit 835077b5cad599fc72497267cb18b1aa1679f163 Merge: 53700c9358 b23ef00d37 Author: LankLTE <[email protected]> Date: Tue Apr 16 19:07:32 2024 -0700 squash! Merge tool integrating b23ef00d37f1c1782e8ca2ff7f3cbea6cffefa7b commit 53700c9358d371e1140330ca6e44a8b755849718 Merge: 4d95a8b303 faec39ced4 Author: LankLTE <[email protected]> Date: Tue Apr 16 19:07:17 2024 -0700 squash! Merge tool integrating faec39ced4d6a65b1ecbf373ba282202171f5224 commit 4d95a8b303338700b31323fda5bf336def1de8a5 Merge: 89ebbecd71 229caa10bf Author: LankLTE <[email protected]> Date: Tue Apr 16 19:07:04 2024 -0700 squash! Merge tool integrating 229caa10bf3417858d2cbd7c1290af12dcad4acc commit 89ebbecd71fa8c768e91abce7bc6aed41681c09b Merge: 5982a2bb5a faba129e78 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:51:58 2024 -0700 squash! Merge tool skipped commit faba129e780859336cfa1a97bb492e7044348ed2. commit 5982a2bb5a708db1d1bb9c5bdab0855589006f3f Merge: 8ee96a4712 cd46282e51 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:51:48 2024 -0700 squash! Merge tool integrating cd46282e51b0368b63344d655564315a709c7355 commit 8ee96a47123b8f9e29507eeeb7948f34e4fa5a58 Merge: 8a85ab8d18 34fbd2874e Author: LankLTE <[email protected]> Date: Tue Apr 16 18:46:39 2024 -0700 squash! Merge tool integrating 34fbd2874e3f2602f8cf1cb55bf4c20588aa8764 commit 8a85ab8d18543dc6d4d6d769693c27720f8d60df Merge: a5413fd99f 4a6cf480cc Author: LankLTE <[email protected]> Date: Tue Apr 16 18:44:42 2024 -0700 squash! Merge tool integrating 4a6cf480cc557447a89ec98b6305b4b461f494ca commit a5413fd99fed67b183995bfa43fa1af79fc76db3 Merge: 4648870ac0 3d0fc10673 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:39:04 2024 -0700 squash! Merge tool integrating 3d0fc1067303635a743af04ef4c463abd0dba343 commit 4648870ac0cb2a82d47cd5b274a0990182b5e049 Merge: 0bbfe394d5 637fc2d475 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:26:47 2024 -0700 squash! Merge tool skipped commit 637fc2d47571cec3c4d2509ac5aa285d2ccd2ab9. commit 0bbfe394d5555cade060f4f3618f6b9904dec640 Merge: 941c1b6de0 7810cbe411 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:26:39 2024 -0700 squash! Merge tool integrating 7810cbe41101fe152c6b30fea937cc4351d4ae29 commit 941c1b6de0d1495a6b0da4c833459a460b33e338 Merge: 55006fc741 41d2f06ffc Author: LankLTE <[email protected]> Date: Tue Apr 16 18:21:56 2024 -0700 squash! Merge tool integrating 41d2f06ffcfb8a67bfeb863ff24889e199971bb6 commit 55006fc7415eb6d28f921877c2eb586e769086f8 Merge: 9d08eb0b06 516f5f3161 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:13:20 2024 -0700 squash! Merge tool integrating 516f5f3161396f8a759d9b44c35d5e9d59f6249f commit 9d08eb0b06d706a4be9671ed0f1cfad9684162f7 Merge: 05f3dfd6ff 563f304ac5 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:13:14 2024 -0700 squash! Merge tool skipped commit 563f304ac57a61bba618c8ec1ffec77151ffc687. commit 05f3dfd6ffda870f5bdeedcf33c39c4649823ff6 Merge: c666d859bf 7a6067989f Author: LankLTE <[email protected]> Date: Tue Apr 16 18:13:04 2024 -0700 squash! Merge tool integrating 7a6067989fde5b5e1b791d40d566adf7a74d203f commit c666d859bf3b449ceae8e46d1dde423d742ca28d Merge: 214465d64e cf8f68c7e5 Author: LankLTE <[email protected]> Date: Tue Apr 16 18:12:47 2024 -0700 squash! Merge tool integrating cf8f68c7e51df1c11b38b0efffda39996a4c4e73 commit 214465d64e02581314b9f2ec0c5f1da78fb7700a Merge: 05159c2613 5270e6f5f9 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:52:18 2024 -0700 squash! Merge tool skipped commit 5270e6f5f9e639b2c55dc26e01b5a184f468101f. commit 05159c2613635665d7a044a0a07810c8328847e8 Merge: 22751e609e 0a29508f43 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:52:08 2024 -0700 squash! Merge tool integrating 0a29508f431e2f08213ca3d2554dc21a80c15061 commit 22751e609ef405b1e9d61373f98823f233134524 Merge: 429d1e7934 44b20f60ff Author: LankLTE <[email protected]> Date: Tue Apr 16 17:47:06 2024 -0700 squash! Merge tool integrating 44b20f60ff178813ebbc5b449229b0bbba81f649 commit 429d1e793441191b04b2480f94ff282703fa56f0 Merge: 52fddd26d4 fbec5d18cf Author: LankLTE <[email protected]> Date: Tue Apr 16 17:45:44 2024 -0700 squash! Merge tool integrating fbec5d18cf175d9418fed77fcb38b673692771c6 commit 52fddd26d4e5ecf60aee0524eb023693c063a0db Merge: 81aa98ea70 055c5ab323 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:45:27 2024 -0700 squash! Merge tool skipped commit 055c5ab323168314095b45b532440508c1447303. commit 81aa98ea70c804535246ad10b1a9c5f2fecc0fa8 Merge: 88cf246935 ef42fb3806 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:45:17 2024 -0700 squash! Merge tool integrating ef42fb38061b29d7202eb6d65f1b658aecc43452 commit 88cf246935a080bd5afd83bd4fa1af0153155612 Merge: 131bfbab5e a7fad5d439 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:44:55 2024 -0700 squash! Merge tool integrating a7fad5d43953ea679418d7c39272bf3224f7767f commit 131bfbab5e6f27ccf639d2b3b6636ca784b8acc6 Merge: 64b14a4708 9d0dfcf2b9 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:44:10 2024 -0700 squash! Merge tool integrating 9d0dfcf2b9fa1b6ba54b3aa26a3f41982b945323 commit 64b14a47082c6a91d705ed912eb8aabb52237891 Merge: 434d26bd89 9752746775 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:43:21 2024 -0700 squash! Merge tool skipped commit 9752746775021f6076fdd88ae384c7df44ba858b. commit 434d26bd8947a0c578e297172dd10f92c3f5a9cb Merge: 6237063628 7a86b1d097 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:43:13 2024 -0700 squash! Merge tool integrating 7a86b1d0977d51c3a43752a7a8bfe055fadadd56 commit 62370636283cc34239716dc5d68d0e3e9e86a532 Merge: c2fb145635 734b6f321d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:42:52 2024 -0700 squash! Merge tool skipped commit 734b6f321d83541c9282bc264a2512f95a686ccb. commit c2fb1456355c0b19e861cbeb277f6d3b67606859 Merge: 686f39fa2a c6ef37cc5f Author: LankLTE <[email protected]> Date: Tue Apr 16 17:42:44 2024 -0700 squash! Merge tool integrating c6ef37cc5f717116a59f465daa119d023a15c262 commit 686f39fa2a457faf775e176692c8191352c21961 Merge: 03238804d4 e0ff7f7625 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:42:30 2024 -0700 squash! Merge tool skipped commit e0ff7f7625db366751000018c298d0ca97df085b. commit 03238804d4f5e9d6099cc4c1d554f08212c480ea Merge: 47c7dbc7fa 7b0dd31b1f Author: LankLTE <[email protected]> Date: Tue Apr 16 17:42:21 2024 -0700 squash! Merge tool integrating 7b0dd31b1fa3a91225c1b3d312ac88dc03ea9959 commit 47c7dbc7fa1ba8142ef70540838733c19c45a559 Merge: a955bddd25 7787a82d03 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:40:50 2024 -0700 squash! Merge tool skipped commit 7787a82d032185b2e165bafe1f342d1a39aeb9fc. commit a955bddd2506cb5b28d2a861fd206dcb21817697 Merge: e919a9f1e2 2b8e26fa2e Author: LankLTE <[email protected]> Date: Tue Apr 16 17:40:37 2024 -0700 squash! Merge tool integrating 2b8e26fa2ebd1946211b245ebd10c1863b82e66d commit e919a9f1e2ff8f1c11318ff77674bb22655a7a84 Merge: 7654fd09ce 4cb344cc30 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:40:04 2024 -0700 squash! Merge tool integrating 4cb344cc307c33247492ba64cccca6dfe720540f commit 7654fd09ce53df22ba2e0609f6b0f9e44426b2d8 Merge: 972f6e6866 d3ac3d06bb Author: LankLTE <[email protected]> Date: Tue Apr 16 17:39:39 2024 -0700 squash! Merge tool integrating d3ac3d06bb6eddd9c2076a586974aabf514a5c86 commit 972f6e6866aa0826ebe7ba2a0ed27043318ef1e5 Merge: 9638dbbbb2 dbf8a036ec Author: LankLTE <[email protected]> Date: Tue Apr 16 17:38:38 2024 -0700 squash! Merge tool skipped commit dbf8a036ecf5a933270127d133927f42a88e3586. commit 9638dbbbb29085cdbddf391ae108e47065c27efe Merge: 434bb25acc d2d62b97ac Author: LankLTE <[email protected]> Date: Tue Apr 16 17:38:15 2024 -0700 squash! Merge tool integrating d2d62b97ac904fd486edd85a885ce682f362576c commit 434bb25acc96b86ec38e01bbb6a1c598b68f7d49 Merge: 9361ae9f95 54b3d7fe45 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:36:25 2024 -0700 squash! Merge tool integrating 54b3d7fe45d8c491acea785aa8081c752cd6d91f commit 9361ae9f956ec16973bd771ed3ec857090a521f5 Merge: 6b4bbc5438 9107d421bd Author: LankLTE <[email protected]> Date: Tue Apr 16 17:36:11 2024 -0700 squash! Merge tool integrating 9107d421bdd2600883780d02d521ebbbec06ac68 commit 6b4bbc5438eff3527ef9c9c2607521315561cd3a Merge: b8d71a08e7 f1d1e6c6fd Author: LankLTE <[email protected]> Date: Tue Apr 16 17:35:57 2024 -0700 squash! Merge tool skipped commit f1d1e6c6fdf169b11e950feeac5d68f7f0aedddd. commit b8d71a08e7679142be89e2e9a6651bb22399c853 Merge: c19ab42c16 c67948407e Author: LankLTE <[email protected]> Date: Tue Apr 16 17:35:49 2024 -0700 squash! Merge tool integrating c67948407ec9ee21c0459ca9679b6fac904aad63 commit c19ab42c16c3460138866b9c7c2958b91b9ae89d Merge: 1d69b77e26 96ad9002f1 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:34:38 2024 -0700 squash! Merge tool integrating 96ad9002f1d6390bf666c74ddfd871a45a8fe1df commit 1d69b77e26e0660f4037d78d253cb5160bf895c8 Merge: dac9f24127 cb4561fe96 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:33:46 2024 -0700 squash! Merge tool skipped commit cb4561fe96adacac3283e9af138fff6eb349eb9f. commit dac9f241270380214c2de651226c25637c4c4cc7 Merge: 8033e1eb51 13cef85a6e Author: LankLTE <[email protected]> Date: Tue Apr 16 17:33:38 2024 -0700 squash! Merge tool integrating 13cef85a6e7d0f5873d1f66358ef742356541582 commit 8033e1eb5154cd9ff8283fb7c4a0e4de96bc8646 Merge: c2c3bf63e6 bbff00cd2a Author: LankLTE <[email protected]> Date: Tue Apr 16 17:33:24 2024 -0700 squash! Merge tool skipped commit bbff00cd2af7a5f5700489b42d94c9d99bc88a52. commit c2c3bf63e6fd58a3f8eb51d4a591a0dd3fe24c90 Merge: 85d10985eb da618d791a Author: LankLTE <[email protected]> Date: Tue Apr 16 17:33:16 2024 -0700 squash! Merge tool integrating da618d791a48efacebe441eee9398c0d1c571ec8 commit 85d10985eb19d27ba7f9c35e72299dd4b0f07633 Merge: a127ce269e dc19964d84 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:32:07 2024 -0700 squash! Merge tool integrating dc19964d84149354bb10fd186283f1a9d7da9cf5 commit a127ce269ecf1a5ae3b0bcafafc37601c76ccf8c Merge: 6dfb7f7c70 33e5e4e581 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:30:04 2024 -0700 squash! Merge tool integrating 33e5e4e581a8d224cc2c44465db188ded0302e4e commit 6dfb7f7c702019cf0acd2f349078763a148a3891 Merge: 56c2b298fd ba9091ff59 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:29:46 2024 -0700 squash! Merge tool skipped commit ba9091ff59251f20aa3d21615d52b40cb937f01c. commit 56c2b298fd69c239bd041636828ec3e84a309f10 Merge: 64e94a877a 8272d7a345 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:29:37 2024 -0700 squash! Merge tool integrating 8272d7a345264e3c10a895f838b3f5f4fa6b35e1 commit 64e94a877aa8100edc58796454827f4f297810bd Merge: f5cba5074e d44db87bfb Author: LankLTE <[email protected]> Date: Tue Apr 16 17:28:50 2024 -0700 squash! Merge tool skipped commit d44db87bfb9e84fb8181d8dbd2ee250d0c6829d3. commit f5cba5074e11523da3e1f792f04c378bd3464d2c Merge: a19d174fe3 9b97a2e05d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:28:42 2024 -0700 squash! Merge tool integrating 9b97a2e05d5fe65b1d81aefcf37b69033c78f21f commit a19d174fe3187564651cdccd269de6e78685c80b Merge: aad0af4b90 1f4a01aa38 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:27:50 2024 -0700 squash! Merge tool integrating 1f4a01aa3857af6d924c4ad9cb2c105b793c2e53 commit aad0af4b9016091860f7249bebf13a442abceae8 Merge: a8929bfc10 ed065e8a3d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:27:36 2024 -0700 squash! Merge tool skipped commit ed065e8a3dbecb688b8aef1c1d597794de1503ef. commit a8929bfc1084df2b2d851cd23fe0091f0aaca3a8 Merge: 1bc99220bc 1bf97c94ee Author: LankLTE <[email protected]> Date: Tue Apr 16 17:27:28 2024 -0700 squash! Merge tool integrating 1bf97c94eecfb9b76d4e2f08765ee5e8a7472151 commit 1bc99220bce9716bf04283b9bf7e0b8c08a5e4e0 Merge: d980495052 154b8606f9 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:27:10 2024 -0700 squash! Merge tool skipped commit 154b8606f9d9cc543c6b8ad422c43f563079327f. commit d98049505261dc0a9730c4e2e92f9ab6f658ca30 Merge: 3a25bdee24 4833074514 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:27:01 2024 -0700 squash! Merge tool integrating 48330745147aba1ce89cdd6e7949da62dc9cbb78 commit 3a25bdee24742c75b0222771482a5af2bf604c48 Merge: a4c5de72d8 037a7d7d3d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:26:41 2024 -0700 squash! Merge tool integrating 037a7d7d3d53a623f70a07908299e8fc4df1b4a5 commit a4c5de72d8a17c7b3e576cf5f19ca722f0fc9402 Merge: 001957734b eeb460fb29 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:26:26 2024 -0700 squash! Merge tool integrating eeb460fb2956381b44ead42f0d435ade11ec0ba3 commit 001957734b5ff017569a67c63fa4b8b11bda57b9 Merge: 1f8785fb2a b086779165 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:26:01 2024 -0700 squash! Merge tool skipped commit b08677916557f34740a9b06e09493751b0af7a82. commit 1f8785fb2af4e0373184f9adca0a512c9b8ec7e8 Merge: 55edaf1354 d4b7bc5aa3 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:25:52 2024 -0700 squash! Merge tool integrating d4b7bc5aa328e200bb087672d00c07776f98edce commit 55edaf1354ce91662975301eb0cc8c2b972ef659 Merge: c727803e2e 2d53cfeabc Author: LankLTE <[email protected]> Date: Tue Apr 16 17:25:35 2024 -0700 squash! Merge tool integrating 2d53cfeabcc977938f217c303ce46a79d7fe80c9 commit c727803e2e9c3c3821777cd19fa590535184881b Merge: 2039a79e12 b51482f51a Author: LankLTE <[email protected]> Date: Tue Apr 16 17:25:22 2024 -0700 squash! Merge tool integrating b51482f51a67bb90f6ccc7fb355c316e200bb36d commit 2039a79e12d5d187a7e294e3f201027ce3735b55 Merge: d217e04fe8 5d00305a22 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:25:05 2024 -0700 squash! Merge tool skipped commit 5d00305a2279b455a7ff5196f62050abeebc4085. commit d217e04fe86dca2ea0e3b72f1ee60c3aa67f7e4e Merge: 0f940f9a51 a49a576b03 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:24:56 2024 -0700 squash! Merge tool integrating a49a576b031d2f90b7e127fd2b639a20bb31aaf4 commit 0f940f9a51a9fc3730404e65aada469858d73555 Merge: 69e113d5b8 2360376b40 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:24:10 2024 -0700 squash! Merge tool skipped commit 2360376b4064db390275f407fcb89190c1e78bd7. commit 69e113d5b859425923c1f7ab6224d249ec61981a Merge: 8e177950a5 0a1ce9dd43 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:24:03 2024 -0700 squash! Merge tool integrating 0a1ce9dd437f162a59c826904241bf15ad6f2838 commit 8e177950a5b9c76af9f527d364951a5a1e404828 Merge: 64abceeb09 24b6456735 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:23:47 2024 -0700 squash! Merge tool integrating 24b6456735ae83dd9de53097d625f20b723c578f commit 64abceeb0932b982c10111e31bf99e91f43f75e5 Merge: 51edd6821a 998bf45368 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:23:33 2024 -0700 squash! Merge tool integrating 998bf453684ed91ae5971e41be72820c87b441ef commit 51edd6821a0bdb1590c78b1f0ab77d5f0e7efcbc Merge: 798cdd58da c8f75d9918 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:23:19 2024 -0700 squash! Merge tool skipped commit c8f75d99186301810a3c16d99ad138107637e723. commit 798cdd58dac191f4608b3de663637e79ebfe1cd3 Merge: 9708e62034 279e01c3d2 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:23:10 2024 -0700 squash! Merge tool integrating 279e01c3d26ce8332114103b2045abb61886c614 commit 9708e62034cf3e9c8fed4a21e6c33ad058577dfc Merge: 071d248272 2a5d23f3f1 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:22:56 2024 -0700 squash! Merge tool skipped commit 2a5d23f3f1fdc72268419bd09fd29d6c265b3e51. commit 071d24827226ae3e05d9a39ca85c745627a4168c Merge: 3b631b874b 3a00e8c59c Author: LankLTE <[email protected]> Date: Tue Apr 16 17:22:46 2024 -0700 squash! Merge tool integrating 3a00e8c59cc595d8f85bdf0319d56bf0741d2dec commit 3b631b874ba057eaf5d820bda12d4161f8638184 Merge: baa077c471 9d5a3992fa Author: LankLTE <[email protected]> Date: Tue Apr 16 17:18:42 2024 -0700 squash! Merge tool integrating 9d5a3992fa635194cfe1d9fbfa60a5ea72288f4e commit baa077c4713840695042f05ac68dec5887d4af3c Merge: f5b298f48c 7d480acb0c Author: LankLTE <[email protected]> Date: Tue Apr 16 17:17:12 2024 -0700 squash! Merge tool integrating 7d480acb0c859e0f186df41b7f2940b2ef5789bb commit f5b298f48c7f44a1ea311c364faad7a0b1094af1 Merge: 4f54e7d009 85aef16954 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:15:30 2024 -0700 squash! Merge tool skipped commit 85aef16954725a72a2c590e9cf7445b15b93d23e. commit 4f54e7d009ed100657e6a90c8e6cd0293d83e460 Merge: 4996295073 e88b2467ca Author: LankLTE <[email protected]> Date: Tue Apr 16 17:15:22 2024 -0700 squash! Merge tool integrating e88b2467ca36c25c15095b7e7e0357c55ed581e2 commit 49962950732336597d1c6db2419e2a030a6632a3 Merge: 0a143f46a3 261e5354d3 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:15:17 2024 -0700 squash! Merge tool skipped commit 261e5354d3601b5ed1a8ea6c6a161a6f79c3f791. commit 0a143f46a38677c1c66469fd12e243e9ca554188 Merge: afd6e4f27f 8f17bf1a3d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:13:59 2024 -0700 squash! Merge tool skipped commit 8f17bf1a3d96c8392c227ecc27b0e7d32c971126. commit afd6e4f27f2fbe5dfb9e38efa09cff9ec9af7aaa Merge: e1331d0a48 e12223c355 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:13:51 2024 -0700 squash! Merge tool integrating e12223c355b3b452d6d6043ec126124189b64f84 commit e1331d0a480ba52b2cb4dc3bee0b318dcad0d216 Merge: c4e403d87a 882aeb0314 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:13:30 2024 -0700 squash! Merge tool integrating 882aeb03143d07a4cef91412008c81c9902075d8 commit c4e403d87abdb0f9779c2e2d37fe5ed9c19da8cc Merge: b3bf9445b7 4627c7c859 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:11:28 2024 -0700 squash! Merge tool skipped commit 4627c7c859f12da60b75880c50b761b4646ea3a0. commit b3bf9445b75afe7ea6112ea8e74ed1e9c069a86a Merge: 9fdb6158dd b895e557d4 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:11:19 2024 -0700 squash! Merge tool integrating b895e557d4503074622ec1ca60e1f7749783a29e commit 9fdb6158dd23d6e59434efb8ac3be6695e7592a5 Merge: ee1e88eb58 264bf7199d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:10:48 2024 -0700 squash! Merge tool integrating 264bf7199d805bd07dbdccc4345c672b19df9333 commit ee1e88eb58ee5acb45c00cc2c847aa3774a6372a Merge: 2073a39a2e 8e9d2744f3 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:10:36 2024 -0700 squash! Merge tool integrating 8e9d2744f3d196fc11e88a4755f98cac8ad8dbee commit 2073a39a2e6ce31ba998d0b0b4daf945477d7065 Merge: 080869a869 6fa90e06c7 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:10:06 2024 -0700 squash! Merge tool skipped commit 6fa90e06c737d449f354b727550a5d1e13aeae44. commit 080869a869f67903e10bf7aefc97a5ee1ac51166 Merge: 0b4c01fea1 9d62b3c3e6 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:09:57 2024 -0700 squash! Merge tool integrating 9d62b3c3e690cdda48143774a5e5db853894e1b8 commit 0b4c01fea12d2d1ce254fab7023b9179cfddcb6f Merge: 221ad6b1e2 75d3502d26 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:09:47 2024 -0700 squash! Merge tool skipped commit 75d3502d267d2050b4f9db1a4c0260c9fb6205e9. commit 221ad6b1e2ea1c0589105961621fb460e75bf0df Merge: b91fd3d690 036abacbb7 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:08:16 2024 -0700 squash! Merge tool integrating 036abacbb731c0d1128a4c6cd1658f64dd488985 commit b91fd3d690a09b3e34a221cd487783537018fe84 Merge: d80b26e208 fc5a90be0d Author: LankLTE <[email protected]> Date: Tue Apr 16 17:07:56 2024 -0700 squash! Merge tool integrating fc5a90be0da4801aa7ff1fbc996c2f55f8cb7ae7 commit d80b26e208b2b6dbfe8ebfcfedb1e09098525886 Merge: b9c9f540bb 00dc99769c Author: LankLTE <[email protected]> Date: Tue Apr 16 17:07:14 2024 -0700 squash! Merge tool skipped commit 00dc99769c2442410204c1ea57bb24cc8353c16a. commit b9c9f540bb4a2f1b68959745cad67017cddddd54 Merge: d75a8fb82b 210ed3ece4 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:07:06 2024 -0700 squash! Merge tool integrating 210ed3ece4230a7fa31c12a43f4fdee0f0614915 commit d75a8fb82b47e0929ae6e85b88f91d921706d927 Merge: b5975215b3 2bcdb608a3 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:06:38 2024 -0700 squash! Merge tool integrating 2bcdb608a3ddd9c91a1169d3f0d2d5b31aaebc88 commit b5975215b3e69982c9ceff4b181d2a0cb01ea847 Merge: daacdde8ba 9eb1e12022 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:05:24 2024 -0700 squash! Merge tool integrating 9eb1e12022c22d0a8b431e4def3a8178aa1924d8 commit daacdde8bab8cb076fff79fe341fb3cfb557c431 Merge: c4097f5bc0 8c16b46613 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:04:24 2024 -0700 squash! Merge tool skipped commit 8c16b466132d946578e7ab4c8c92dd3ddfe94f89. commit c4097f5bc021516815d434615d2b793f9591293a Merge: 0949d7bab1 4017f9bd28 Author: LankLTE <[email protected]> Date: Tue Apr 16 17:02:57 2024 -0700 squash! Merge tool integrating 4017f9bd28251a3cbf3c0fb34499c6b821051498 commit 0949d7bab16420f3b654d0db28bd84009dd1d881 Merge: 0885872bbe f1cbf934b0 Author: LankLTE <[email protected]> Date: Tue Apr 16 16:56:23 2024 -0700 squash! Merge tool skipped commit f1cbf934b0142518e71189359950c85f16c13a0d. commit 0885872bbe3c3cb04ed1d0622f0eb244928f562a Merge: 8c1603177c 1cdf05a7a7 Author: LankLTE <[email protected]> Date: Tue Apr 16 16:56:15 2024 -0700 squash! Merge tool integrating 1cdf05a7a7169ed655a294b6bbe24a75f58f62fa commit 8c1603177c41f1d702fbd5d1ed1232ce36252446 Merge: 5de881bf89 57911975c7 Author: LankLTE <[email protected]> Date: Tue Apr 16 16:55:24 2024 -0700 squash! Merge tool skipped commit 57911975c70dafcc3af9dfa08a86c9acda472497. commit 5de881bf899c9133232f3799b6c83064cd51fd28 Merge: 46e5bc2ba4 58e4b5fe4c Author: LankLTE <[email protected]> Date: Tue Apr 16 16:55:17 2024 -0700 squash! Merge tool integrating 58e4b5fe4ceab7f9bd60eb3d87daab9d01954a3b commit 46e5bc2ba417201b2b10071925ccca035bc99b31 Merge: 9a609c1d59 7d599a7199 Author: LankLTE <[email protected]> Date: Tue Apr 16 16:54:54 2024 -0700 squash! Merge tool skipped commit 7d599a7199f21d71f3befa26e7ffec003a887dd3. commit 9a609c1d597defa5b65e3ab751c13b6248bea972 Merge: a8715e170b 935127f25f Author: LankLTE <[email protected]> Date: Tue Apr 16 16:54:47 2024 -0700 squash! Merge tool integrating 935127f25fef5cce6e0d5c4b73db5c6077badf56 commit a8715e170ba588c017eeacc29053733e27d046fe Merge: 9ea1d1ca86 3aee197923 Author: LankLTE <[email protected]> Date: Tue Apr 16 16:54:21 2024 -0700 squash! Merge tool integrating 3aee19792391cbfb06edb65d6f16f77da0f36f13 commit 9ea1d1ca862a4546a0392c98d8eb25ca2b3bf179 Merge: 07f36b7838 297853929b Author: LankLTE <[email protected]> Date: Tue Apr 16 16:52:22 2024 -0700 squash! Merge tool integrating 297853929b7b3859760dcdda95e21888672ce8e1 commit fff3fe2a2461dfc61333b1875f8c5b7a9537c9e0 Author: metalgearsloth <[email protected]> Date: Tue Apr 16 22:42:53 2024 +1000 Update submodule to 218.1.0 (#26997) commit b23ef00d37f1c1782e8ca2ff7f3cbea6cffefa7b Author: Velcroboy <[email protected]> Date: Mon Apr 15 23:34:35 2024 -0500 Add QM maintenance airlock (#26982) Co-authored-by: Velcroboy <[email protected]> commit faec39ced4d6a65b1ecbf373ba282202171f5224 Author: Leon Friedrich <[email protected]> Date: Tue Apr 16 16:26:47 2024 +1200 Give names to solution & identity entities (#26993) commit 229caa10bf3417858d2cbd7c1290af12dcad4acc Author: Leon Friedrich <[email protected]> Date: Tue Apr 16 16:26:32 2024 +1200 Fix some TryGetMind overrides relying on player data (#26992) * Fix some TryGetMind overrides relying on player data * A * Rider has bamboozled me * Update `data.Mind` before attaching to entity. commit faba129e780859336cfa1a97bb492e7044348ed2 Author: PJBot <[email protected]> Date: Mon Apr 15 22:23:23 2024 +0000 Automatic changelog update commit cd46282e51b0368b63344d655564315a709c7355 Author: Velcroboy <[email protected]> Date: Mon Apr 15 17:22:16 2024 -0500 Fix some airlocks with multiple access types (#26980) Co-authored-by: Velcroboy <[email protected]> commit 34fbd2874e3f2602f8cf1cb55bf4c20588aa8764 Author: MilenVolf <[email protected]> Date: Mon Apr 15 14:53:22 2024 +0300 Fix dragon slowdown on damage (#26975) Fix dragon slow on damage commit 4a6cf480cc557447a89ec98b6305b4b461f494ca Author: Whisper <[email protected]> Date: Mon Apr 15 01:04:15 2024 -0400 Mobs burn to ashes on excessive heat damage (#26971) * mobs burn to ashes on excessive heat damage * remove comment, remove random lines I didn't mean to add * combine code into behavior * clean unused * fix namespace * drop next to * fix spawn entities behavior spawning entities outside container commit 3d0fc1067303635a743af04ef4c463abd0dba343 Author: Hannah Giovanna Dawson <[email protected]> Date: Mon Apr 15 02:53:22 2024 +0100 SS14-26950 Fix Waddling During Improper States (#26965) * SS14-26950 Fix Waddling During Improper States Fix some states when a clown can waddle when no clown should be able to waddle, no-matter their clowning powers. 1. You cannot waddle whilst weightless 2. You cannot waddle whilst stunned 3. You cannot waddle whilst slowed down due to stam damage 4. You cannot waddle whilst you're knocked down 5. You cannot waddle whilst you're buckled 6. You cannot waddle whilst crit 7. You cannot waddle whilst dead There's some argument for being able to waddle whilst on the floor and doing some bizarre floor-humping exercise but I'm not coding an animation layer system just to handle clowns doing the worm. * Use a nicer "can move" check commit 637fc2d47571cec3c4d2509ac5aa285d2ccd2ab9 Author: PJBot <[email protected]> Date: Mon Apr 15 01:29:04 2024 +0000 Automatic changelog update commit 7810cbe41101fe152c6b30fea937cc4351d4ae29 Author: no <[email protected]> Date: Mon Apr 15 03:27:58 2024 +0200 Fix StepTrigger blacklist not working (#26968) commit 41d2f06ffcfb8a67bfeb863ff24889e199971bb6 Author: HS <[email protected]> Date: Mon Apr 15 03:38:13 2024 +0300 meatWall incorrect node fixed (#26966) changed node in construction meatWall commit 516f5f3161396f8a759d9b44c35d5e9d59f6249f Author: deltanedas <[email protected]> Date: Mon Apr 15 00:11:28 2024 +0000 nerf incendiary grenade (#26959) Co-authored-by: deltanedas <@deltanedas:kde.org> commit 563f304ac57a61bba618c8ec1ffec77151ffc687 Author: PJBot <[email protected]> Date: Sun Apr 14 22:27:52 2024 +0000 Automatic changelog update commit 7a6067989fde5b5e1b791d40d566adf7a74d203f Author: Token <[email protected]> Date: Mon Apr 15 03:26:46 2024 +0500 Make lockers can be deconstructed only when unlocked now (#26961) * Fix lockers are not deconstrucable now Lockers are was deconstructable event when they closed and you didn't have access to them. In short - get stuff by 5 seconds, 5 sec it's time to screw down any locker, except LockerBaseSecure one * Revert un-destructable lockers fix Make lockers destructable again * Fix lockers that deconstructable only when unlocked now commit cf8f68c7e51df1c11b38b0efffda39996a4c4e73 Author: lzk <[email protected]> Date: Sun Apr 14 23:53:45 2024 +0200 Fix rubber hammer being unshaded (#26956) commit 5270e6f5f9e639b2c55dc26e01b5a184f468101f Author: PJBot <[email protected]> Date: Sun Apr 14 20:05:12 2024 +0000 Automatic changelog update commit 0a29508f431e2f08213ca3d2554dc21a80c15061 Author: beck-thompson <[email protected]> Date: Sun Apr 14 13:04:05 2024 -0700 Fixed cybersun pen attacking noise (#26951) * Uupdated the cyberpen * Updated noise * Removed flashlight commit 44b20f60ff178813ebbc5b449229b0bbba81f649 Author: Ed <[email protected]> Date: Sun Apr 14 17:26:28 2024 +0300 Rotate and Offset station CCVar nuke (#26175) * no content * add noRot to Europa * bruh. and this * yay * fix commit fbec5d18cf175d9418fed77fcb38b673692771c6 Author: ilya.mikheev.coder <[email protected]> Date: Sun Apr 14 15:33:04 2024 +0200 Use round time instead of server time for criminal history (#26949) make criminal records computer use round time for history instead of the server time commit 055c5ab323168314095b45b532440508c1447303 Author: PJBot <[email protected]> Date: Sun Apr 14 12:14:00 2024 +0000 Automatic changelog update commit ef42fb38061b29d7202eb6d65f1b658aecc43452 Author: Hannah Giovanna Dawson <[email protected]> Date: Sun Apr 14 13:12:54 2024 +0100 Clown shoes make you waddle, as God intended (#26338) * Clown shoes make you waddle, as God intended * OOPS * Toned down, client system name fix * Tidy namespacing for @deltanedas * Refactor to handle prediction better, etc. * Resolve PR comments. commit a7fad5d43953ea679418d7c39272bf3224f7767f Author: Froffy025 <[email protected]> Date: Sun Apr 14 06:16:23 2024 -0400 Wield recoil components (#26915) * WieldRecoilComponents * WieldRecoilComponents * Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs Co-authored-by: Whisper <[email protected]> * Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs --------- Co-authored-by: Whisper <[email protected]> Co-authored-by: metalgearsloth <[email protected]> commit 9d0dfcf2b9fa1b6ba54b3aa26a3f41982b945323 Author: Pieter-Jan Briers <[email protected]> Date: Sun Apr 14 12:13:29 2024 +0200 Game server admin API (#26880) * Reapply "Game server api" (#26871) This reverts commit 3aee19792391cbfb06edb65d6f16f77da0f36f13. * Rewrite 75% of the code it's good now commit 9752746775021f6076fdd88ae384c7df44ba858b Author: PJBot <[email protected]> Date: Sun Apr 14 08:55:46 2024 +0000 Automatic changelog update commit 7a86b1d0977d51c3a43752a7a8bfe055fadadd56 Author: Tyzemol <[email protected]> Date: Sun Apr 14 13:54:40 2024 +0500 Add character sheets to board game crate (#26926) add character sheets to board game crate commit 734b6f321d83541c9282bc264a2512f95a686ccb Author: PJBot <[email protected]> Date: Sun Apr 14 08:54:03 2024 +0000 Automatic changelog update commit c6ef37cc5f717116a59f465daa119d023a15c262 Author: Mr. 27 <[email protected]> Date: Sun Apr 14 04:52:57 2024 -0400 make holoparasites actually holographic (#26862) it's over commit e0ff7f7625db366751000018c298d0ca97df085b Author: PJBot <[email protected]> Date: Sun Apr 14 08:52:13 2024 +0000 Automatic changelog update commit 7b0dd31b1fa3a91225c1b3d312ac88dc03ea9959 Author: BramvanZijp <[email protected]> Date: Sun Apr 14 10:51:07 2024 +0200 WT550 Buffs + Burst Mode for WT550 & C-20R (#26886) * Slightly increased WT550 Firerate, drastically reduced recoil, and given it the option to fire in 5 round bursts. * Given the C-20 a 5 round burst aswell commit 7787a82d032185b2e165bafe1f342d1a39aeb9fc Author: PJBot <[email protected]> Date: Sun Apr 14 08:42:45 2024 +0000 Automatic changelog update commit 2b8e26fa2ebd1946211b245ebd10c1863b82e66d Author: Flareguy <[email protected]> Date: Sun Apr 14 03:41:39 2024 -0500 Greyscale color clothing (#26943) * greyscales color gloves, color jumpsuits, and shoes * remove popbob * fix test fails commit 4cb344cc307c33247492ba64cccca6dfe720540f Author: metalgearsloth <[email protected]> Date: Sun Apr 14 17:10:37 2024 +1000 Fix options menu crashing in replays (#26911) Not having the nullable set properly is annoying but fixing that would probably be a significant amount of work. commit d3ac3d06bb6eddd9c2076a586974aabf514a5c86 Author: Pieter-Jan Briers <[email protected]> Date: Sun Apr 14 07:39:43 2024 +0200 Fix database round start date issues (#26838) How can ONE DATABASE COLUMN have so many cursed issues I don't know, but it certainly pissed off the devil in its previous life. The start_date column on round entities in the database was added by https://github.com/space-wizards/space-station-14/pull/21153. For some reason, this PR gave the column a nonsensical default value instead of making it nullable. This default value causes the code from #25280 to break. It actually trips an assert though that's not what the original issue report ran into. This didn't get noticed on wizden servers because we at some point backfilled the start_date column based on the stored admin logs. So I change the database model to make this column nullable, updated the C# code to match, and made the existing migration set the invalid values to be NULL instead. Cool. Wait how's SQLite handle in this scenario anyways? Well actually turns out the column was *completely broken* in the first place! The code for inserting into the round table was copy pasted between SQLite and PostgreSQL, with the only difference being that the SQLite key manually assigned the primary key instead of letting SQLite AUTOINCREMENT it. And then the code to give a start_date value was only added to the PostgreSQL version (which is actually in the base class already). So for SQLite that column's been filled up with the same invalid default the whole time. Why was the code manually assigning a PK? I checked the SQLite docs for AUTOINCREMENT[1], and the behavior seems appropriate. I removed the SQLite-specific code path and it just seems to work regardless. The migration just sets the old values to NULL too. BUT WAIT, THERE'S MORE! Turns out just doing the migration on SQLite is a pain in the ass! EF Core has to create a new table to apply the nullability change, because SQLite doesn't support proper ALTER COLUMN. This causes the generated SQL commands to be weird and the UPDATE for the migration goes BEFORE the nullability change... I ended up having to make TWO migrations for SQLite. Yay. Fixes #26800 [1]: https://www.sqlite.org/autoinc.html commit dbf8a036ecf5a933270127d133927f42a88e3586 Author: PJBot <[email protected]> Date: Sun Apr 14 05:36:41 2024 +0000 Automatic changelog update commit d2d62b97ac904fd486edd85a885ce682f362576c Author: Terraspark4941 <[email protected]> Date: Sun Apr 14 10:35:35 2024 +0500 Autism pins! (#25597) * hee hee he ha ha * added gold varients, forgive me for my spritework * maints loot, copying from past PRs * Trying to fix RSI * speedran these sprites in break time, pictures will be later * Fixed/Tweaked glows * consensus * gregregation * dam copiryte * oops i forgot to delete 2 fields hope this works commit 54b3d7fe45d8c491acea785aa8081c752cd6d91f Author: metalgearsloth <[email protected]> Date: Sun Apr 14 15:05:35 2024 +1000 Update submodule to 218.0.0 (#26945) commit 9107d421bdd2600883780d02d521ebbbec06ac68 Author: Tayrtahn <[email protected]> Date: Sat Apr 13 23:42:45 2024 -0400 Add two-message overload to PopupPredicted (#26907) Added two-message overload to PopupPredicted commit f1d1e6c6fdf169b11e950feeac5d68f7f0aedddd Author: PJBot <[email protected]> Date: Sun Apr 14 03:40:08 2024 +0000 Automatic changelog update commit c67948407ec9ee21c0459ca9679b6fac904aad63 Author: DrSmugleaf <[email protected]> Date: Sat Apr 13 20:39:22 2024 -0700 Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled (#25826) * Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled * merge conflicts --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> commit 96ad9002f1d6390bf666c74ddfd871a45a8fe1df Author: Verm <[email protected]> Date: Sat Apr 13 22:39:02 2024 -0500 You can now see paper on crates (with color!) (#26834) * Implement changes on not-cooked branch * Made it work * Fix update appearance calls * Fix extra indents, clean-up code, fix tests hopefully * Fix hammy cagecrate * Fix messing up the yml, add artifact crate specific labels back in * Visual Studio hates yml, sad * Seperate the colors for cargonia * sorry json * make label move with artifact door * Apply suggestion changes Co-authored-by: Nemanja <[email protected]> * Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??) --------- Co-authored-by: Nemanja <[email protected]> commit cb4561fe96adacac3283e9af138fff6eb349eb9f Author: PJBot <[email protected]> Date: Sun Apr 14 03:18:23 2024 +0000 Automatic changelog update commit 13cef85a6e7d0f5873d1f66358ef742356541582 Author: DrSmugleaf <[email protected]> Date: Sat Apr 13 20:17:17 2024 -0700 Fix rockets and lasers looking like they have nothing loaded (#26933) commit bbff00cd2af7a5f5700489b42d94c9d99bc88a52 Author: PJBot <[email protected]> Date: Sun Apr 14 03:13:44 2024 +0000 Automatic changelog update commit da618d791a48efacebe441eee9398c0d1c571ec8 Author: GreaseMonk <[email protected]> Date: Sun Apr 14 05:12:38 2024 +0200 Add Ability to stop sound when MobState is Dead (#26905) * Add stopsWhenEntityDead to sound components * Convert component * Review * Fix dupe sub --------- Co-authored-by: metalgearsloth <[email protected]> commit dc19964d84149354bb10fd186283f1a9d7da9cf5 Author: metalgearsloth <[email protected]> Date: Sun Apr 14 13:07:14 2024 +1000 Fix standart -> standard and dressfilled test fail (#26942) Fix standart -> standard commit 33e5e4e581a8d224cc2c44465db188ded0302e4e Author: chromiumboy <[email protected]> Date: Sat Apr 13 22:01:01 2024 -0500 Bug fix: Force cancellation of RCD constructions if the construction type is changed (#26935) Force cancellation of RCD constructions if the construction type is changed commit ba9091ff59251f20aa3d21615d52b40cb937f01c Author: PJBot <[email protected]> Date: Sun Apr 14 02:52:30 2024 +0000 Automatic changelog update commit 8272d7a345264e3c10a895f838b3f5f4fa6b35e1 Author: superjj18 <[email protected]> Date: Sat Apr 13 22:51:24 2024 -0400 Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai. (#26939) * Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai. * Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml --------- Co-authored-by: Tayrtahn <[email protected]> commit d44db87bfb9e84fb8181d8dbd2ee250d0c6829d3 Author: PJBot <[email protected]> Date: Sun Apr 14 02:20:49 2024 +0000 Automatic changelog update commit 9b97a2e05d5fe65b1d81aefcf37b69033c78f21f Author: Tayrtahn <[email protected]> Date: Sat Apr 13 22:19:42 2024 -0400 Fix cryostorage identifying unknown characters as captain (#26927) Fixed cryostorage getting captain's record for unknown jobs. Also localized Unknown job string. commit 1f4a01aa3857af6d924c4ad9cb2c105b793c2e53 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat Apr 13 21:46:55 2024 -0400 Update Credits (#26938) Co-authored-by: PJBot <[email protected]> commit 07f36b7838698f08dffa979fa381a7284f47e590 Author: dffdff2423 <[email protected]> Date: Sat Apr 13 17:29:44 2024 -0500 Remove rubbers from Senior Officer (#221) commit ed065e8a3dbecb688b8aef1c1d597794de1503ef Author: PJBot <[email protected]> Date: Sat Apr 13 20:50:08 2024 +0000 Automatic changelog update commit 1bf97c94eecfb9b76d4e2f08765ee5e8a7472151 Author: Boaz1111 <[email protected]> Date: Sat Apr 13 22:49:02 2024 +0200 Fix for the salvage ice labs map. (#26928) * done * more work commit 6a9fae4bd570b7fe281fbbb07d3835174a17d661 Author: PursuitInAshes <[email protected]> Date: Sat Apr 13 10:45:24 2024 -0600 Vulpkanin Species (#214) * DeltaV Body Folder https://github.com/DeltaV-Station/Delta-v/tree/master/Resources/Prototypes/DeltaV/Body as of 3/6/24 * Audio I'll have to check the copyright and licensing of these, but there is the port. * Locale Files * Entities for marking and the mod its self. Removes only one line, which is making vulps a potential psyonic. * Create Vulpakin.yml Removes Dogvision Trait, Removes Carriable, from what I can see its mail related. Discussion will have to happen on if we want to keep the unique face sprites for helmets, but for now its commented in. * Name Datasets Sorta iffy on this, and I need to go through and read them all, make sure there aren't any issues. I'm half tempted to just make vulps pull from the human list, but thats also going on the discussion list. * Emotes,Sounds, Speaking Verbs Vulp talk sounds are sorta funny, but they work I suppose? * Talking Sounds Again, going to have to check the licensing on these, but there there are. * Sprites Oh boy, excited to check the meta files on these. * Update Path * More Path Fixes + Clown Sprites * Bunch of stuff - Messing around with stomach tags, this might not hang around but we'll see, I want them to be able to digest more than meat but idk what these do exactly -Limbs now inherent their base limb along with the vulp limp -More heat damage (I don't know how I feel about this) - Audio Collection, forgot this a while ago - Declare Species and a bunch of other stuff * YAML Trimming Everything removed should be inherited from their parent, or outright wasn't needed. Also adds an FTL File I missed. There is a typo somewhere and I still haven't been able to get licenses checked, just working to get them ingame first. * Reorganize things to hopefully fix errors More parent fixes too, I'm only getting two errors now, so thats a good thing. Both errors reside in line two of these files, not quite sure how to fix them at the moment. * Remove Diet Restriction * Reorder and remove some md in body proto Bonus is this might fix the last issue (that I know of) with the code * Maybe fix indentation issue This error is driving me insane * Fix error This caused more errors, but at least you can play as the species now * Code Clean Up and better mark down Tuned the temperature thresholds * Port The Howling PR DeltaV PR #884 - This doesn't effect licensce concerns except maybe for code? Its YML so there is really only one way to actually do things. * Sound Improvements - Fixes a Pathing issue in the sounds (Forgor to update in the pathing) - Localizes their speech verbs further - Removes their ability to cry :3 - Makes their emote sounds work. - scream1 and scream2 do not exist currently, just drop them in: Audio\_CD\Voice\Vulpkanin once they exist. Untill then this will be a fun error * Better Tail Wagging pt1 Moves the tail wagging to the lizard system because its so much better Still need to make sure there isn't extra localisation, I need to localize the new markings and trim the ones we technically removed from the character selector * Whoops I'm not fixing the scream yaml fail because I don't have sound files for them yet - soonTM hopefully, I really don't want to use human screams for these guys * Local Alert Crash Fix * Revert "Local Alert Crash Fix" This reverts commit 5114b3e0ccb5666a9813af0c4ab9f2b50dab1ffc. * Better Tail Wagging Pt 2 - Fixes Extra Locales - Removes Animated Tails from Character Creator * Eh, I want these at least playable I'll make an issue for vulp improvements once they are merged * Reattribute fluffy tail sprite * Meta/Attribution Cleanup & Improvement - Removes Audio Licensce File (Merged into Attributions) - Update Texture Attributions to be more accurate for our use. * Correctly Push Talk Folder Attribution Fix * Fix RGA Test - Didn't realize it was looking for a URL only, whoops. commit 154b8606f9d9cc543c6b8ad422c43f563079327f Author: PJBot <[email protected]> Date: Sat Apr 13 15:37:11 2024 +0000 Automatic changelog update commit 48330745147aba1ce89cdd6e7949da62dc9cbb78 Author: TsjipTsjip <[email protected]> Date: Sat Apr 13 17:36:33 2024 +0200 Replace SetDamage call with TryChangeDamage in ImmovableRodSystem.cs (#26902) commit 037a7d7d3d53a623f70a07908299e8fc4df1b4a5 Author: ShadowCommander <[email protected]> Date: Sat Apr 13 08:36:05 2024 -0700 Fix pulling a new entity when already pulling an entity (#26499) Fix pulling when already pulling The TryStopPull were failing due to wrong arguments provided. Replacing the virtual item in hand with a different pull was failing due to the hand not being cleared. Fix stop pulling checks that had the wrong variables provided. VirtualItems are already queue deleted at the end of HandleEntityRemoved. commit eeb460fb2956381b44ead42f0d435ade11ec0ba3 Author: FungiFellow <[email protected]> Date: Sat Apr 13 10:35:10 2024 -0500 Removed Salv Borg Crusher Dagger (#26865) commit b08677916557f34740a9b06e09493751b0af7a82 Author: PJBot <[email protected]> Date: Sat Apr 13 15:26:59 2024 +0000 Automatic changelog update commit d4b7bc5aa328e200bb087672d00c07776f98edce Author: keronshb <[email protected]> Date: Sat Apr 13 11:26:51 2024 -0400 Fixes polymorph cooldowns (#26914) fixes polymorph cooldowns commit 2d53cfeabcc977938f217c303ce46a79d7fe80c9 Author: DrSmugleaf <[email protected]> Date: Sat Apr 13 08:26:25 2024 -0700 Fix guns that spawn without a magazine looking like they have one (#26922) commit b51482f51a67bb90f6ccc7fb355c316e200bb36d Author: DrSmugleaf <[email protected]> Date: Sat Apr 13 08:25:53 2024 -0700 Fix incorrect "Cycled" and "Bolted" popups when (un)wielding a gun (#26924) commit 9c65a28e0d54055b2d59213711e591183ff0df4f Author: dffdff2423 <[email protected]> Date: Fri Apr 12 23:15:18 2024 -0500 Add flash protection to sechud (#220) commit 5d00305a2279b455a7ff5196f62050abeebc4085 Author: PJBot <[email protected]> Date: Sat Apr 13 02:37:34 2024 +0000 Automatic changelog update commit a49a576b031d2f90b7e127fd2b639a20bb31aaf4 Author: Vasilis <[email protected]> Date: Sat Apr 13 04:36:28 2024 +0200 Uncooked animal proteins is safe for animal stomachs only (#26906) Uncooked animal proteins is safe for animal stomachs commit 2360376b4064db390275f407fcb89190c1e78bd7 Author: PJBot <[email protected]> Date: Sat Apr 13 01:47:08 2024 +0000 Automatic changelog update commit 0a1ce9dd437f162a59c826904241bf15ad6f2838 Author: osjarw <[email protected]> Date: Sat Apr 13 04:46:00 2024 +0300 Fixed magboot activation distance (#26912) commit 24b6456735ae83dd9de53097d625f20b723c578f Author: DrSmugleaf <[email protected]> Date: Fri Apr 12 16:22:07 2024 -0700 Fix the stripping menu being openable without StrippingComponent (#26908) commit 998bf453684ed91ae5971e41be72820c87b441ef Author: TsjipTsjip <[email protected]> Date: Fri Apr 12 22:47:44 2024 +0200 Health analyzer UI unit correction (#26903) Correct Kelvin displayed on health analyzer UI, use T0C constant. commit c8f75d99186301810a3c16d99ad138107637e723 Author: PJBot <[email protected]> Date: Fri Apr 12 08:03:12 2024 +0000 Automatic changelog update commit 279e01c3d26ce8332114103b2045abb61886c614 Author: Ko4ergaPunk <[email protected]> Date: Fri Apr 12 11:02:06 2024 +0300 Strobes added (#26083) * Done * Adds new * empty * attributions * empty * strobe admin deleted commit 2a5d23f3f1fdc72268419bd09fd29d6c265b3e51 Author: PJBot <[email protected]> Date: Fri Apr 12 07:16:10 2024 +0000 Automatic changelog update commit 3a00e8c59cc595d8f85bdf0319d56bf0741d2dec Author: deltanedas <[email protected]> Date: Fri Apr 12 07:15:04 2024 +0000 Sterile swab dispenser instead of box (#24986) * sterile swab dispenser * trust --------- Co-authored-by: deltanedas <@deltanedas:kde.org> commit 9d5a3992fa635194cfe1d9fbfa60a5ea72288f4e Author: Nemanja <[email protected]> Date: Fri Apr 12 03:07:25 2024 -0400 uplink and store freshening (#26444) * uplink and store freshening * more * im gonna POOOOOOGGGGGGG * we love it commit 7d480acb0c859e0f186df41b7f2940b2ef5789bb Author: Velcroboy <[email protected]> Date: Fri Apr 12 02:04:35 2024 -0500 Add drink container suffixes (#26835) Co-authored-by: Velcroboy <[email protected]> commit 85aef16954725a72a2c590e9cf7445b15b93d23e Author: PJBot <[email protected]> Date: Fri Apr 12 06:59:08 2024 +0000 Automatic changelog update commit e88b2467ca36c25c15095b7e7e0357c55ed581e2 Author: Token <[email protected]> Date: Fri Apr 12 11:58:02 2024 +0500 NoticeBoard is craftable now (#26847) * NoticeBoard is craftable now * Fix notice board to proper name capitalization * Fix notice board proper name in description * Update Resources/Prototypes/Recipes/Construction/furniture.yml --------- Co-authored-by: metalgearsloth <[email protected]> commit 261e5354d3601b5ed1a8ea6c6a161a6f79c3f791 Author: Brandon Hu <[email protected]> Date: Fri Apr 12 06:56:35 2024 +0000 Fix grammar in changelog (#26894) Grammar Co-authored-by: metalgearsloth <[email protected]> commit 8f17bf1a3d96c8392c227ecc27b0e7d32c971126 Author: PJBot <[email protected]> Date: Fri Apr 12 06:51:51 2024 +0000 Automatic changelog update commit e12223c355b3b452d6d6043ec126124189b64f84 Author: liltenhead <[email protected]> Date: Thu Apr 11 23:50:45 2024 -0700 Remove reagent slimes from ghost role pool (#26840) reagentslimeghostrole commit 882aeb03143d07a4cef91412008c81c9902075d8 Author: Token <[email protected]> Date: Fri Apr 12 11:50:10 2024 +0500 Update .editorconfig to correspond Code Conventions (#26824) Update editorconfig to Code Style End of line is: CRLF (suggestion) Namespace declarations are: file scoped (suggestion). Instead of block scoped commit 4627c7c859f12da60b75880c50b761b4646ea3a0 Author: PJBot <[email protected]> Date: Fri Apr 12 06:45:53 2024 +0000 Automatic changelog update commit b895e557d4503074622ec1ca60e1f7749783a29e Author: Verm <[email protected]> Date: Fri Apr 12 01:44:47 2024 -0500 Fix shaker sprites (#26899) * Change basefoodshaker to parent from basefoodcondiment instead * Make them still refillable commit 264bf7199d805bd07dbdccc4345c672b19df9333 Author: Tayrtahn <[email protected]> Date: Fri Apr 12 02:42:20 2024 -0400 Allow advertisement timers to prewarm (#26900) Allow advertisement timers to prewarm. commit 8e9d2744f3d196fc11e88a4755f98cac8ad8dbee Author: Tayrtahn <[email protected]> Date: Fri Apr 12 02:30:34 2024 -0400 Fix potted plant popup/sfx spam (#26901) Fixed potted plant hide popup/sfx spam. commit 6fa90e06c737d449f354b727550a5d1e13aeae44 Author: PJBot <[email protected]> Date: Thu Apr 11 20:49:54 2024 +0000 Automatic changelog update commit 9d62b3c3e690cdda48143774a5e5db853894e1b8 Author: lunarcomets <[email protected]> Date: Thu Apr 11 13:48:46 2024 -0700 Cryogenic storage tweaks (#26813) * make cryo remove crewmember's station record when going to cryo * Revert "make cryo remove crewmember's station record when going to cryo" This reverts commit 9ac9707289b5e553e3015c8c3ef88a78439977c6. * make cryo remove crewmember from station records when the mind is removed from the body * add stationwide announcement for people cryoing (remember to change pr title and desc) * minor changes * announcement actually shows job now * requested changes * get outta here derivative commit 75d3502d267d2050b4f9db1a4c0260c9fb6205e9 Author: Mr. 27 <[email protected]> Date: Thu Apr 11 15:11:13 2024 -0400 fix evil roleplay changelog (#26893) agh commit 036abacbb731c0d1128a4c6cd1658f64dd488985 Author: keronshb <[email protected]> Date: Thu Apr 11 13:40:02 2024 -0400 Immovable Rod changes (#26757) commit fc5a90be0da4801aa7ff1fbc996c2f55f8cb7ae7 Author: chromiumboy <[email protected]> Date: Thu Apr 11 07:26:34 2024 -0500 Bug fix for deconstructing tiles and lattice with RCDs (#26863) * Fixed mixed deconstruction times for tiles and lattice * Lattice and power cables can be deconstructed instantly commit 00dc99769c2442410204c1ea57bb24cc8353c16a Author: PJBot <[email protected]> Date: Thu Apr 11 12:22:21 2024 +0000 Automatic changelog update commit 210ed3ece4230a7fa31c12a43f4fdee0f0614915 Author: Pieter-Jan Briers <[email protected]> Date: Thu Apr 11 14:22:21 2024 +0200 Fix TEG assert (#26881) It's possible to trigger this by stacking it weirdly with the spawn panel. Just make it bail instead. commit 2bcdb608a3ddd9c91a1169d3f0d2d5b31aaebc88 Author: Jark255 <[email protected]> Date: Thu Apr 11 15:21:15 2024 +0300 Fix door electronics configurator usage (#26888) * allow usage of network configurator for door electronics * add checks for "allowed" items commit 9eb1e12022c22d0a8b431e4def3a8178aa1924d8 Author: Ghagliiarghii <[email protected]> Date: Wed Apr 10 20:22:29 2024 -0400 Update ashtray to allow all cigarettes / cigars (#26864) * Update ashtray to allow all cigarettes / cigars This also includes joints (as they are technically cigarettes) * ? commit 8c16b466132d946578e7ab4c8c92dd3ddfe94f89 Author: PJBot <[email protected]> Date: Wed Apr 10 21:21:11 2024 +0000 Automatic changelog update commit 4017f9bd28251a3cbf3c0fb34499c6b821051498 Author: Flareguy <[email protected]> Date: Wed Apr 10 16:20:05 2024 -0500 Add emergency nitrogen lockers (#26752) commit f1cbf934b0142518e71189359950c85f16c13a0d Author: PJBot <[email protected]> Date: Wed Apr 10 20:07:37 2024 +0000 Automatic changelog update commit 1cdf05a7a7169ed655a294b6bbe24a75f58f62fa Author: deltanedas <[email protected]> Date: Wed Apr 10 20:06:31 2024 +0000 fix lots of door access (#26858) * dirty after calling SetAccesses * fix door access * D * pro ops * nukeop --------- Co-authored-by: deltanedas <@deltanedas:kde.org> commit 57911975c70dafcc3af9dfa08a86c9acda472497 Author: PJBot <[email protected]> Date: Wed Apr 10 17:52:33 2024 +0000 Automatic changelog update commit 58e4b5fe4ceab7f9bd60eb3d87daab9d01954a3b Author: botanySupremist <[email protected]> Date: Wed Apr 10 10:51:25 2024 -0700 Clipping a harvestable plant yields undamaged seeds (#25541) Clipping a plant in any condition currently causes it and its clippings to be damaged. Make clipping harvestable (already eligible for seed extractor) plants yield seeds at full health. commit 7d599a7199f21d71f3befa26e7ffec003a887dd3 Author: PJBot <[email protected]> Date: Wed Apr 10 17:29:11 2024 +0000 Automatic changelog update commit 935127f25fef5cce6e0d5c4b73db5c6077badf56 Author: Джексон Миссиссиппи <[email protected]> Date: Wed Apr 10 12:28:03 2024 -0500 Give botanists droppers (#26839) Start botanists with droppers so that they can better dose robust harvest or mutagen. commit 3aee19792391cbfb06edb65d6f16f77da0f36f13 Author: Pieter-Jan Briers <[email protected]> Date: Wed Apr 10 14:19:32 2024 +0200 Revert "Game server api" (#26871) Revert "Game server api (#24015)" This reverts commit 297853929b7b3859760dcdda95e21888672ce8e1. commit 297853929b7b3859760dcdda95e21888672ce8e1 Author: Simon <[email protected]> Date: Wed Apr 10 11:37:16 2024 +0200 Game server api (#24015) * Revert "Revert "Game server api (#23129)"" * Review pt.1 * Reviews pt.2 * Reviews pt. 3 * Reviews pt. 4 commit e6f589f0e0e160171a9e1e08c14b893469936d71 Author: LankLTE <[email protected]> Date: Tue Apr 9 22:35:21 2024 -0700 Laying Down (#217) * Basic emote implementation * Fixes issues. commit 9cd4ad899e42ae2fa5c9abf992a3c8e4a805f400 Author: PursuitInAshes <[email protected]> Date: Tue Apr 9 23:27:27 2024 -0600 More scarfs (#216) * Sprites + Colored Scarf Implimentation Doesn't include into quickthreads or other clothing vendors * File Paths are important * Metas, items exist, winterdrobe I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk * File Path Fix * Typo fix commit 2fd511da28041966cee965efc4b137c9b069d88a Merge: 1f20ebd5a6 a5a7c84fa5 Author: LankLTE <[email protected]> Date: Tue Apr 9 20:44:34 2024 -0700 Merge Upstream 9/4/24 (#219) Merge Upstream 9/4/24 commit a5a7c84fa58b56d89967a75738bb3bf86faf373e Author: LankLTE <[email protected]> Date: Tue Apr 9 20:32:50 2024 -0700 Fix arbitage. commit 7958b97e2e6097b8bc24337d6be5f83358982202 Author: LankLTE <[email protected]> Date: Tue Apr 9 20:09:03 2024 -0700 Fix size conflicts. commit f91024bec56f6f6af685cbf278181a455ced58c4 Merge: 94f8e81cdd 28e5db7be5 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:16:50 2024 -0700 squash! Merge tool skipped commit 28e5db7be5e3e80cf7c1a1e5448fd0db8b586841. commit 94f8e81cddd7b7968bf3404edbd57fd943f281de Merge: 145e884348 aa2e1facbd Author: LankLTE <[email protected]> Date: Tue Apr 9 19:16:41 2024 -0700 squash! Merge tool integrating aa2e1facbd1f476fcef966a4ad41339979300eef commit 145e88434845783a85f61a1465ea201f66902a02 Merge: 0b6eea25a4 3ae4b5884b Author: LankLTE <[email protected]> Date: Tue Apr 9 19:16:34 2024 -0700 squash! Merge tool skipped commit 3ae4b5884b5065db6b203310098f2c3eece4d1d9. commit 0b6eea25a456f70f4eb3561712ca868a7cea0e8a Merge: 27b0dcbc0a fd067731b5 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:16:26 2024 -0700 squash! Merge tool integrating fd067731b544eb219493338a8fe446c154e880f4 commit 27b0dcbc0a829dc852f789085707c7010e5f8530 Merge: 6500889ed9 682afd4ae4 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:15:27 2024 -0700 squash! Merge tool integrating 682afd4ae499e09df8703fef78f5ab015be676c7 commit 6500889ed9c70f221a67d8c3c9d569dd72b82813 Merge: cdfcbdcdc4 862f820708 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:15:22 2024 -0700 squash! Merge tool skipped commit 862f820708637ede67fb6c8e49792c657a5932f6. commit cdfcbdcdc48aeeebdaa8978629d2e197f14d77bb Merge: e3dbfe4eb5 d879665b52 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:15:13 2024 -0700 squash! Merge tool integrating d879665b52c6c30d057e94ed49b222b8a1585717 commit e3dbfe4eb5e08c36e14db76711aad12a379ac01d Merge: 344696ea5b 6d695dd326 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:14:33 2024 -0700 squash! Merge tool integrating 6d695dd3262c8a7492ce2164da6d16add9d80017 commit 344696ea5bc2ef56c482fc49f7e9b043d207ff52 Merge: 72fb2b783f 694ae001fd Author: LankLTE <[email protected]> Date: Tue Apr 9 19:14:28 2024 -0700 squash! Merge tool skipped commit 694ae001fdd7c3b59b7f33a88b2e656edcf73341. commit 72fb2b783fcfe6fefbc5b6511a1fa7acc7cb3d51 Merge: cabbdc59bc a1fcfed7d9 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:14:18 2024 -0700 squash! Merge tool integrating a1fcfed7d93cf493181aefa66e86e70e5d925e1c commit cabbdc59bcca97de16ee97757aff9cfa1e451836 Merge: 59d1e3cc56 a0de0ab1f8 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:13:52 2024 -0700 squash! Merge tool integrating a0de0ab1f807be5ad69fcc04136755239d75ce8a commit 59d1e3cc56f6f831770618aee3f13f781f1e238a Merge: 8369d2edfd e64288a8fe Author: LankLTE <[email protected]> Date: Tue Apr 9 19:13:42 2024 -0700 squash! Merge tool integrating e64288a8feafcc1d8e02dfbae9dc00f01952d3c6 commit 8369d2edfd8989789d1ce8ab0d9adb55796561df Merge: ca113a768d 2cc4098406 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:11:30 2024 -0700 squash! Merge tool integrating 2cc409840628982594b18f888b698d6543ea07dc commit ca113a768d24c6b19e2c5cf567a29180cc6bc5d6 Merge: dc1f7ead1d 14866173c0 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:11:24 2024 -0700 squash! Merge tool skipped commit 14866173c0568b12cb138973bdbcc1d7db167766. commit dc1f7ead1d76c103a4e0fdffacc15ab3ad3ee39e Merge: e9ed377c09 263469dffa Author: LankLTE <[email protected]> Date: Tue Apr 9 19:11:14 2024 -0700 squash! Merge tool integrating 263469dffa200eab09ba270a2eb58f1b98c78f2f commit e9ed377c093136f73d32efb4eb8bb6fcbbd15117 Merge: 6a2537c359 2f5c639a15 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:10:46 2024 -0700 squash! Merge tool integrating 2f5c639a151ace90365e929486ba479655b9cd63 commit 6a2537c3598a25a445dd5a0f45a5a3a75725a68d Merge: 2d8ece86aa 3d6d7820d6 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:10:27 2024 -0700 squash! Merge tool integrating 3d6d7820d641450ca6c6903edd20e85af311a8b6 commit 2d8ece86aa061ef4b37d1546abbc287d70370660 Merge: 809ff231ae 7f56ba0155 Author: LankLTE <[email protected]> Date: Tue Apr 9 19:10:12 2024 -0700 squash! Merge tool skipped commit 7f56ba0155da28ab915e6d9d2122d1bef44536dd. commit 809ff231ae21c0b31e321fba7cd68afee5f6e5f6 Merge: 1a7e8698c1 6ce53709bd Author: LankLTE <[email protected]> Date: Tue Apr 9 19:10:01 2024 -0700 squash! Merge tool integrating 6ce53709bd12b4779d87fe3d4312039e7e9c8dfc …
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Adds 12 new scarfs, you can find the list in media. Its from the light orange scarf down. I opted to put them in the winterdrobe since thats where the rest of the scarfs are, but I'm more than willing to move them to quick threads.
Why / Balance
More clothing for player and character representation
Media
Breaking changes
Nothing currently, since they are in the winterdrobe they may cause merge conflicts later but I tried to label them decently well.
Changelog
Various scarfs have been added, you can find them in the winterdrobe. These are namely pride related scarfs.