mirror of
https://github.com/Skyrat-SS13/Skyrat-tg.git
synced 2026-07-19 03:45:14 +01:00
9a9b428b61
This PR is reverting the wallening by reverting everything up to
8868a5d1fe and replaying the PRs skipping
#85491.
The following 239 (39 + Wallening Main PR excluded) PRs need to be
replayed (DO NOT EDIT THIS LIST MANUALLY, IT IS USED BY THE BOT TO TRACK
PROGRESS):
- [x] #85777 - Reverted in 3
- [x] #85767 - Reverted in 2
- [x] #85763 - Reverted in c
- [x] #85762 - Reverted in 2
- [x] #85760 - Reverted in dbc19df13b033ac8bb5a83fa38c5cf140cf31836
- [x] #85733 - Reverted in 22f17d057eac71661b86c3f2186489568c130043
- [x] #85721 - Reverted in 6d90643dbbc90f3d21f2d25dc85dc4d4f706d6a3
- [x] #85719 - Reverted in c52954648309ad4786238f409cd33142d486190f
- [x] #85705 - Reverted in 3b5ddabfd5ab2cfec226a643be6e8a8fd656c831
- [x] #85684 - Reverted in cbc1839625f44ba67bcd5489c3629ef98e31b2d4
- [x] #85662 - Reverted in 69cac24e236604c262093abea7b9566ecbd092c4
- [x] #85663 - Reverted in f394c3b1430d346b0598abf19fe511b30c3f4676
- [x] #85673 - Reverted in 8a9ae0411488c9c779a54c5c41076238c230a304
- [x] #85718 - Reverted in f8f18d8b626e963b06555f76850702740d5de0c3
- [x] #85667 - Reverted in a1365766d178b727b6c6b503ad410e9d88d57ddd
- [x] #85683 - Reverted in 3bdb0207d883de8db6f726d976025517cc6d3cba
- [x] #85676 - Reverted in 0a5d667b2c8a9a2519af2a4fda8cd39f568e5049
- [x] #85661 - Reverted in 49fc6bc1815133644d7173aa7914ede6c900218a
- [x] #85682 - Reverted in b41efe96fd72228b079319ac07c660f4cd974af6
- [x] #85695 - Reverted in 89a173b136cb0297070cef39c5bc9783b6323f02
- [x] #85654 - Reverted in 1e4836b5173a40fbeb8755e0fb76ebc8d39fe1e0
- [x] #85655 - Reverted in b4dde41eebd0422e1ec440b4d8d54229fc9617f4
- [x] #85634 - Reverted in 0c352fc785762da025a68873438593b508f757d9
- [x] #85700 - Reverted in 1327cf7fe48d7f4fd227120508f77c831aefa4ca
- [x] #85633 - Reverted in c71c8c9d43112a1f4c6331bbba546881dcffd59d
- [x] #85649 - Reverted in 73484337077f616878e63208d9bf2309f0d2e579
- [x] #85475 - Reverted in 839f700001a57646109e75332d5311fe27bbc957
- [x] #85467 - Reverted in 6f08421f64d01b13775d146cf7a451f9f38e195a
- [x] #85472 - Reverted in 63c6a9b04e72e8130df5eeb2861c75f80a97e3de
- [x] #85300 - Reverted in 7c776034f34ee6a76810c1a3779f169f2430c418
- [x] #85249 - Reverted in 257d02273751fc1f939f76756f70b614a6e06789
- [x] #85236 - Reverted in f9f4c444c8fc027dea87d4dbe0ebb8dd6bc67154
- [x] #85299 - Reverted in f24ddff51dc3fec7145a2e97f057f1b286921db3
- [x] #85228 - Reverted in cb8c318f7e2183d9f941c582f79e4c8b2503d95c
- [x] #84910 - Reverted in 2a562ca26d9d13f335c276487f66edaa0d21b3bd
- [x] #84889 - Reverted in 679da6885b034bcd8843f7f4c855388bce263733
- [x] #84766 - Reverted in 4035dd7adee74af0fed82c14a8749585b2ab1c96
- [x] #85607 - Reverted in dc9a0462b4c287cee2d541925f8a9988d18d9d85
- [x] #85618 - Reverted in 2a06f57c89939dc31e9273ef250bd050cff17ff1
- [x] #85619 - Reverted in b98661affc90e44c68a58c05e57cdf1dfd094c93
- [x] #85608 - Reverted in 57a935126233f90255aef0a55dab16524be1faac
- [x] #85648 - Reverted in ab82c66a95d4fbff86040b421a86cc82dca73009
- [x] #85692 - Reverted in f04fac92bd3594f12f244bae9ea0c5c300c737fb
- [x] #85544 - Reverted in 7b1198eb5c700e85ec163e60828c01fac55a9909
- [x] #85631 - Reverted in 81c04ceb553f9887d59f8edf8b2526ff3807264b
- [x] #85529 - Reverted in 2a7e2c8e3856d67cdefda0d25803393070a6e996
- [x] #85525 - Reverted in 6ed2d9f28a9333c705eafd21acf54771b8e4db36
- [x] #85514 - Reverted in a4fa2aa79d93b69d15e0fb9cb1fb7a5bc288bb34
- [x] #85520 - Reverted in 6e1bd4b11cd55e36cab332c5a0c90c76a2e43703
- [x] #85521 - Reverted in 79afdac194da5f42b38fb0fdfc394f2b8d485266
- [x] #85519 - Reverted in a967cae1fb3feea23fdf196595e496431740f52d
- [x] #85513 - Reverted in e3934edf8794f93a37dc7f63c60aa64ed7b60736
- [x] #85498 - Reverted in cf1fadbc54a1365362aaeb142cbbd4e2c3be6f15
- [x] #85485 - Reverted in 2a650ef9c0454bd650d6a13d10c0cb71bb134b2b
- [x] #85494 - Reverted in bbb97958010dc0f74cee279fd304a7fcaccb625e
- [x] #85552 - Reverted in f1780715bd054300e50e9102ad150c76690d4ca1
- [x] #85724 - Reverted in 6933699cef8b01f9aef989f36ca079680a2777ff
- [x] #85735 - Reverted in a6564f19226ef3969bec0573b49fa772d6e6df31
- [x] #85729 - Reverted in f728d121a2f27a3cc7973fc2041df9b7193b796d
- [x] #85704 - Reverted in 38f5b034a3370eda4657a2a5a6adcf3df6ec280c
- [x] #85660 - Reverted in 7db39869d37ff5b39574d88ffc872449ab5b457c
- [x] #85752 - Reverted in 1f2988028b7cccad121fc658d6547d89453703b7
- [x] #85592 - Reverted in 263cbcfcb54746a9361369d86b44cc3e2d375199
- [x] #85580 - Reverted in a92d53624198dce844c108b5dbea09cf2a16cd10
- [x] #85573 - Reverted in a7d51042355798038ced44f64e987261b85e93bc
- [x] #85534 - Reverted in 31787e7d1ce4fec2ce20776672099bf35486a296
- [x] #85511 - Reverted in 2567a2eb56cdb7058f89ea298e53197147198d82
- [x] #85508 - Reverted in 69de2ac16c20d968adcd19f0732fd2f84a4ae90e
- [x] #85680 - Reverted in 44437ac406c708b9a3ab3b47f4e3c10e77a0b91b
- [x] #85551 - Reverted in 7f17d428fd2787a6982534bfc9ac9188fd4b8675
- [x] #85478 - Reverted in bd9e575dafc62dc7e1259e8c19199ba15d82be4f
- [x] #85476 - Reverted in 4ce8052076de0bb52f1ed87663920e98482ade62
- [x] #85593 - Reverted in 9ff5924d3d56fcba3f180fc4b539568fb2013323
- [x] #85441 - Reverted in db96015adaec01f3fbcb978796a0d7abd5668932
- [x] #85567 - Reverted in 62696ad04fb34fd946708309bd3e439db9b3f488
- [x] #85337 - Reverted in 1267e9f002d03c33187afd2e734e95a78a5ca6ac
- [x] #85348 - Reverted in 4fcc3c659ee2a38d978e137252309644d5adde8f
- [x] #85350 - Reverted in e691c833dd5aca2e7808591516e8443e8ccf1b27
- [x] #85744 - Reverted in 251578d2868a691981b824a268c540b9c15a424e
- [x] #85772 - Reverted in bc6804a04aa9368074bcc853e689c8fe6de2cb3a
- [x] #85797 - Reverted in a05e36ec4a0129ff6901ea07488120b54a8ee124
- [x] #85787 - Reverted in a5393f94b9e71d9ea0625e5fcfb5baaf16af38d3
- [x] #85742 - Reverted in cd99a2aeaa1347b790c9bfdae35e41900e2ada9a
- [x] #85440 - Reverted in 8b5ead7c7f0d8087b41256a296e730443752f17d
- [x] #85739 - Reverted in 3511aae5a4798104220b79ad0e5b2b357dc1e83b
- [x] #85293 - Reverted in fc687ca36ef476ab9080f0c62b427ab0af533d68
- [x] #85716 - Reverted in 130b32a222a7585cfdde71aa561fb8b2c7d8083b
- ~~[ ] #85848 - Reverted in f6c46ca2f5cb2d039e4b26731570ca801741cc5d~~
(SKIPPED)
- [x] #85795 - Reverted in 4684c3325a9135b6bf10eb43026f373993bf605d
- [x] #85859 - Reverted in 0e0838fe11b7d9af4f62af4f7388ed8fb57bf49c
- [x] #84873 - Reverted in 34407b79a45718a305f3bfe3fac7f129b4f1c51f
- [x] #85864 - Reverted in 4b25a209c5019bb65922cd793aff339f20c3d026
- ~~[ ] #85845 - Reverted in a326246e81b7b9242bbf45e7ab3b31caf9ce8147~~
(SKIPPED)
- [x] #85844 - Reverted in bdf1e6c1e3469884550d3211e51ec9303a022482
- ~~[ ] #85843 - Reverted in 41a8acb196af0988372b06ade7131d07d03daab3~~
(NOT BEING INCLUDED)
- ~~[ ] #85840 - Reverted in 4807bacea8418000f84d62ca0fb122846cab4929~~
(NOT BEING INCLUDED)
- ~~[ ] #85837 - Reverted in bc9edfa8666de14ca4e57e466146d753182a3a71~~
(NOT BEING INCLUDED)
- [x] #85865 - Reverted in 14c958b465af40f0ff28b100047c4c572919ae19
- ~~[ ] #85818 - Reverted in a77256f74e2d330f5f76141eb9c994a8e5e45810~~
(NOT BEING INCLUDED)
- [x] #85822 - Reverted in caba685be95fd336f0b09e88bccfb8856d5ad9b4
- [x] #85794 - Reverted in 0d4de984eb8513d065e8ac724e8cde11f01d4ef7
- [x] #85756 - Reverted in 9c5a7e1a5f895851493e149ccb5cd50e35cd6101
- [x] #85852 - Reverted in 74303e5bbae8426a073d068ef4342d8acc420a09
- ~~[ ] #85841 - Reverted in e5831ce3cc87765cb13e6d342417bc1730780392~~
(NOT BEING INCLUDED)
- ~~[ ] #85834 - Reverted in 1be665204da791ec7520d0799c015157fc625953~~
(NOT BEING INCLUDED)
- [x] #85792 - Reverted in 33b4e48175040f9f76ef83d3154f10c69589b6ad
- [x] #85646 - Reverted in fd23a0d6c4c96470b688dc0a35370c61c7e32f61
- ~~[ ] #85799 - Reverted in 4a7a6d812f2f301c1e749c92f324223f9bde8a39~~
(NOT BEING INCLUDED)
- [x] #85819 - Reverted in 8bf001b7889d3a4282947cd332833c473b98eac1
- [x] #85479 - Reverted in 6aeb5ef4582c03febe0c914185d29f75df4d5d94
- ~~[ ] #85824 - Reverted in 9ca3edfaa17d97306ac73207ef32fd1272061f6b~~
(SKIPPED)
- [x] #85406 - Reverted in 702280ff48c8aef44f4da9a85eb33a7bc5faa013
- [x] #85778 - Reverted in ce0ec5c685aadb02ae049d6714f1d2fd6dae1f26
- ~~[ ] #85851 - Reverted in 610c68b275cf3c54181d36ce48bd97b0cce0665c~~
(NOT BEING INCLUDED)
- [x] #85754 - Reverted in 5cbdda00c5335db79ea50aedba097de1d06bf91b
- [x] #85266 - Reverted in abdfec798e5223dfa9d67e1967d7618454dbec28
- ~~[ ] #85823 - Reverted in 86b766abd3d77af8ad835a3464fc5ff95cc11079~~
(NOT BEING INCLUDED)
- ~~[ ] #85842 - Reverted in 7ddd47e26ef1bc336e92a6675a33ec3191039c16~~
(NOT BEING INCLUDED)
- [x] #85857 - Reverted in e32312ee20e9fdccb6dd7c4dc2d185540bd2276b
- [x] #85856 - Reverted in 7d5d74c2b55a08ef5553568e996053157359dbe2
- [x] #85276 - Reverted in 1d6fa881e4aef1e6b368d5b6809bccb021fbbd2a
- [x] #85886 - Reverted in f27d6cabdf8f06f29926616345fa82c4e1e48708
- ~~[ ] #85771 - Reverted in 019d898b601c9ef4d45b7ee0f2144518ee127ca9~~
(SKIPPED)
- [x] #85464 - Reverted in adc00417795deb85f8aa6170b0f0a07c40c8798c
- ~~[ ] #85870 - Reverted in d69b998420bfb39693bb59b9b9a20611880fdafa~~
(NOT BEING INCLUDED)
- ~~[ ] #85869 - Reverted in 0063c69f111bb67144f9b379476250ce86c99eee~~
(NOT BEING INCLUDED)
- [x] #85530 - Reverted in b40c93399411d277b3899e149196f3eb974f841f
- ~~[ ] #85871 - Reverted in 63908bbd0a71d0a2bd0a4691816c17cc9eb5310c~~
(NOT BEING INCLUDED)
- ~~[ ] #85832 - Reverted in b29dab083f091198d65a9b0754536f13a935dc2c~~
(SKIPPED)
- ~~[ ] #85825 - Reverted in d072b294ca3bc526df5128df45653db97ba38fe1~~
(NOT BEING INCLUDED)
- [x] #85632 - Reverted in 290092c7d826aa5b100a38cd4bacc5330b39a934
- [x] #85902 - Reverted in 76118d620e71f1819a9385863b689d9a8d4ea810
- [x] #85906 - Reverted in 82623c2cc0fd9aee3e79c95fe5558146c59bc941
- [x] #85907 - Reverted in 68b7305f21240ca28c33afc904ee532966b7c4bd
- [x] #85449 - Reverted in ab86a79339ef7b01ceb08dc7279c698927ebcbfa
- ~~[ ] #85875 - Reverted in 0a1fcda90e638e66d574c247e93f0669d0c27b0e~~
(NOT BEING INCLUDED)
- ~~[ ] #85861 - Reverted in 6dad5111aa144860371c93a2d78094fe3d39a7e1~~
(NOT BEING INCLUDED)
- [x] #85264 - Reverted in dc1d2dcc995f33fc5773e037f5171e9516897281
- [x] #85726 - Reverted in dbd9ec81586c87c1ab2afc43d43c4f020907dc1b
- [x] #85730 - Reverted in 7de2c2a1d012ccb03f82c6beabd71a66aa0f910a
- [x] #85880 - Reverted in 02169d2f28611765997fa332dda69c8031436fd1
- [x] #85176 - Reverted in e3c85aae1cf665c9892bf7280b7b48ea42323198
- ~~[ ] #85887 - Reverted in 56b35f294b303fd30fbd7685011d37b456d584c7~~
(NOT BEING INCLUDED)
- [x] #85883 - Reverted in 53be06a505ebd8581114bba8590e378d387b6c1a
- ~~[ ] #85882 - Reverted in a8877ff0083ca5753e3d3b1b9c9edc3613fa6570~~
(NOT BEING INCLUDED)
- [x] #85895 - Reverted in 741235d41b3a19a40434653f1c14fc0999fac9c3
- ~~[ ] #85746 - Reverted in b7aebb6e5788f6c484173f0a5e29f042ea0c8560~~
(NOT BEING INCLUDED)
- ~~[ ] #85889 - Reverted in d677231d8c55efcd2cf427d510d961cd00f186c7~~
(NOT BEING INCLUDED)
- ~~[ ] #85888 - Reverted in 693f79abae54980ee098d602ed79926d51d5094b~~
(NOT BEING INCLUDED)
- [x] #85898 - Reverted in 4f41fda23e6b9711aef5d00836591c1ac230612e
- ~~[ ] #85821 - Reverted in 738c9a75f65c4a376da36ad208e1fd8fdeac1ff0~~
(NOT BEING INCLUDED)
- [x] #85694 - Reverted in f7ea4d19cdaa2067c87c43362b514c684b56b1f3
- [x] #85308 - Reverted in 4a89b62774da5e9ec9ea241c60ec2a99f51f9bed
- [x] #85904 - Reverted in 999dbe1773cc7488c629bb8d0d21be5454dbef60
- ~~[ ] #85901 - Reverted in bbf832da9e0c61ad25221530df3b1e93cace25dd~~
(NOT BEING INCLUDED)
- ~~[ ] #85896 - Reverted in 542fe408728faaef8a16869e13c4661018a8a07c~~
(NOT BEING INCLUDED)
- [x] #85927 - Reverted in 7dc87df28e79ef3e9f3fad83cc0907d2dc867c47
- [x] #85908 - Reverted in bcca80f073a486ca7908e9636d0e8b275c2085bf
- [x] #85929 - Reverted in 094bf3610a73961f6433a52ada1a52f25d853738
- [x] #85877 - Reverted in 5874cafd0dab8d3bd61cf1f662793c2708f42dcc
- [x] #85903 - Reverted in b3ba8fffc5548e0f2ae6bada3baf10bad3c75e54
- ~~[ ] #85913 - Reverted in 67f7ec48d20f9a64ce4664fa2c452a25b60db59e~~
(SKIPPED)
- [x] #85914 - Reverted in 7efcd3a5f7fef33c2a1625386bfead80a6ed5309
- [x] #85917 - Reverted in fc50a5ff998d0e7269131a029e533e90e9dc3c54
- ~~[ ] #85949 - Reverted in 10a8e0f5c69e3ca1eb6e26f00945bfe226598bc2~~
(NOT BEING INCLUDED)
- ~~[ ] #85338 - Reverted in 847549ab938f77464829b1392a1b6f2b2f4b9e8f~~
(SKIPPED)
- ~~[ ] #85922 - Reverted in 3d9388249b8c322aac5dd4980d4ab4673ca01006~~
(SKIPPED)
- [x] #85923 - Reverted in 2c6ffa4decf40eb52a92353aeb98aee8cbc7b4a2
- ~~[ ] #85920 - Reverted in 1de5b03981d9fcf9c2e6823bffa515fb939aa541~~
(NOT BEING INCLUDED)
- [x] #85919 - Reverted in 1773e9baccdc941285f56ccb416f5c7125b031ef
- [x] #85271 - Reverted in aecf8002cf2807a76b6b295867e50392b4bc4534
- [x] #85918 - Reverted in 023ec3a4d1b1b2fc8f596fea65a77ddc9a06689f
- [x] #85924 - Reverted in e4886079ad90f33628ac59e0793dfbbc8b8b9420
- [x] #85928 - Reverted in 7470b7d5ac40be21c345e8825f4c4efc4738e29f
- [x] #85926 - Reverted in 7761c9e3a1f442f37d4db4b27e5d78fae95edf00
- [x] #85900 - Reverted in 633736cb0655dc464e9794666c63ae6ec7689826
- [x] #85909 - Reverted in a47c7ec8a77bd02f8b7bb1ce3c621efbe57077c3
- ~~[ ] #85931 - Reverted in 9bc7a412982da6fbdb9cd24570d98877b76a45c3~~
(NOT BEING INCLUDED)
- ~~[ ] #85894 - Reverted in c15e1711656929aeb59f482145ecf029b40d58b8~~
(SKIPPED)
- ~~[ ] #85759 - Reverted in f45d70be0ffb9bf007bfa18a1bd1b5ce23d6dcfc~~
(SKIPPED)
- ~~[ ] #85892 - Reverted in fc08dc1a7160f584c94e368962eb56c18dccc86a~~
(SKIPPED)
- ~~[ ] #85915 - Reverted in 428f475c26f383998a689560a16de86da3f17557~~
(NOT BEING INCLUDED)
- [x] #85222 - Reverted in 66e7ac2f00735c90acdb69a50c9e485a0f4e1552
- [x] #85150 - Reverted in 3079387f926e41febb576105ec0b3acec2f7beba
- [x] #85935 - Reverted in ce6114f644593ead295763362a61d19077f22acf
- ~~[ ] #85936 - Reverted in f601fa796bce7e70645a84fff91391cbb6ed8e37~~
(NOT BEING INCLUDED)
- [x] #85937 - Reverted in 64242f589df3d9118fd5c09d19574758260c76a1
- ~~[ ] #85940 - Reverted in a979c6c24705a8729efab5eca40840f1c8070f1d~~
(NOT BEING INCLUDED)
- ~~[ ] #85942 - Reverted in 9562c14083212fc962b8687663ba5fac2ebfdd1a~~
(NOT BEING INCLUDED)
- [x] #85944 - Reverted in adf8e1927e4b9886c9042d6a0eaaef74e4e0e102
- [x] #85605 - Reverted in 88dbfb4f859f12549e8cf8ed5204ee8d7183d40f
- [x] #85945 - Reverted in dea9e79a9c298eae05b8d173d8df4a37218e2d9c
- [x] #84964 - Reverted in 234481fb1d92a266768fcbca49245151236803ed
- [x] #85952 - Reverted in c62d87ab54d687db64b1551b319195527ca92924
- [x] #85953 - Reverted in bd0e46245ccb597081b8baa4f81ff85949f672be
- ~~[ ] #85943 - Reverted in 697b6841391354885ef2d314d9185b8eee7a5cb0~~
(NOT BEING INCLUDED)
- [x] #85946 - Reverted in f4afd4d330b6fc28397f7707bca8773d44cb15ed
- [x] #85950 - Reverted in 394fffcb836f32f4e1b1fd91a621249e0e5d7d67
- [x] #85955 - Reverted in 2230a5bc141cd11fc79ccf6b4b653257508a7e65
- [x] #85319 - Reverted in fdaddd9cd6ed0bdd1cd78ba3c9729035936abcbd
- ~~[ ] #85934 - Reverted in 41bb6122b6d6e3c38c500d5ddf63808836ab090e~~
(NOT BEING INCLUDED)
- ~~[ ] #85255 - Reverted in 3e213b8554b40e53f6429969d6e9dbaa357fb09e~~
(SKIPPED)
- ~~[ ] #85961 - Reverted in 6f3d000b3601dc7f75f7edd221fab3edc3bbbd8c~~
(NOT BEING INCLUDED)
- [x] #85956 - Reverted in a5bf22a93ca1a149ca839e6c874d088b32c7c25f
- [x] #85958 - Reverted in c964a46741bd26a600bb75bc6463c629c11c914f
- ~~[ ] #85969 - Reverted in b599cd4bd3ae223210eb0d3b47c3bd814e1cb08c~~
(NOT BEING INCLUDED)
- [x] #85252 - Reverted in 5a0e2f31a6e1093ab47970056f5bb3af54172e12
- [x] #85984 - Reverted in b000da82f62bb48b059a881d596f3a2e7d985d21
- [x] #85137 - Reverted in 1f31b558e41fc66d5da9db30a83d89cbb9949eae
- [x] #85881 - Reverted in f3913f94c4557c4fc9d5605cd8e875accabebda6
- [x] #85972 - Reverted in d3afed87a3a8eed7e0016512d2186b6aded0fca9
- [x] #85998 - Reverted in 3d286b763cf2f7fe11b6f0ccb2456130570726c2
- [x] #85358 - Reverted in 75f84bda1b3c80d54ae94a567bf96016aaae45b2
- ~~[ ] #85964 - Reverted in be1aeb010afa20c1b6949218d8911ee9e900b3d7~~
(SKIPPED)
- [x] #85960 - Reverted in 69cbfce1529377ce7cd998ab474add0d61650d7f
- [x] #85992 - Reverted in 89e4a7bb0b793461338ba1b0a3d332bf78ef140c
- [x] #85967 - Reverted in d398e418eb340f309be523514ae0befdf1869560
- [x] #84888 - Reverted in bb98eb09f06a1fdc0bbb733d6a42d711e6d477bc
- ~~[ ] #85983 - Reverted in 81152a9cd347eb7b4073758e2e96490e6e729ca9~~
(NOT BEING INCLUDED)
- [x] #85976 - Reverted in 93c091347ca8f04763b91fd4c39ccdff848a0d50
- ~~[ ] #85962 - Reverted in de32ea25b534c725e3d55418ef0363145f0ed2b0~~
(NOT BEING INCLUDED)
- [x] #85977 - Reverted in 393652a1ef065014748ae6977a9f36b32c99dc7c
- [x] #85959 - Reverted in 52e6e07eb98bcb74a423934b14d5850dbf2c6647
- ~~[ ] #85988 - Reverted in a5853ccde46b5fee2d9eb31755384de15e7a5a87~~
(SKIPPED)
- ~~[ ] #85974 - Reverted in eab20ba04e6b06f862a0fb35cedb6374af7b93c0~~
(SKIPPED)
- [x] #85939 - Reverted in ca85b05692f55f6b3e4bd0b3f30c63f89531c33f
- [x] #85878 - Reverted in 3b3d3dbff9148e46b01f3af28f17f66bef4dfd16
- [x] #85858 - Reverted in 08d6082e62d07117170ff5ffd065daad1278e853
- [x] #85651 - Reverted in b76ab4a2114dd0eb78336878b2825d9919c210cc
- [x] #85505 - Reverted in 0958eaa7b6f4d48400bea4e215e11edaa933ba8a
- ~~[ ] #85352 - Reverted in 620cec18618e514bbe4d3eb0a0d0db1528b9d312~~
(SKIPPED)
- [x] #85279 - Reverted in ba0fd529ef94ba793fe2eee40975533fe8f475e3
- [x] #85954 - Reverted in d7fe0336f2a968b93fd02361814930236e3b8ddf
- ~~[ ] #85996 - Reverted in 5fbd62139e0c1b668aaaf35d249d527cdc276b93~~
(SKIPPED)
- [x] #85994 - Reverted in c99a03c6833ac58e0288111953573f697488234f
- [x] #85470 - Reverted in fbd5ac46d84d27455cbcf5f998741124ed6de625
- ~~[ ] #85981 - Reverted in dc74c75011ddfb1b16d644fd2ca5607599532d6f~~
(NOT BEING INCLUDED)
- [x] #86011 - Reverted in b14b42e70e2bd21f19d443065b2342e4591c5e05
- [x] #85820 - Reverted in 26248546b9f7d0fedec52e7b2f7def40d457e29f
- [x] #86013 - Reverted in e17ac14f53d08be988f0516e7c39d31496a35184
- [x] #85986 - Reverted in 4021ffea0b1bbb1f6c5b26a296abd5a8bda1d5b3
- [x] #86019 - Reverted in c0801b3aa5dbdd33ca7c6c81e80c9fa573ada9e1
- [x] #86010 - Reverted in 10dff005729305b75deaf1c5755a94125fa5141d
- [x] #86029 - Reverted in 664619213db52930fa22007561dad01fe8bb3de4
- [x] #86024 - Reverted in e74ea4368cbd2cd085aa6e8bbe83db07800b0bd4
- [x] #86022 - Reverted in 0b2fc6a1f478c48546b161fd3ddd571f7ed6000f
- [x] #86015 - Reverted in b99d93592dbf8840a035f22f26b64bcf27c817cb
- [x] #85415 - Reverted in d6102c7339838675c03eb771d7a3b5a9bea4035d
- ~~[ ] #85703 - Reverted in 339b7edf3c0318f9f02922018d6918211660234f~~
(SKIPPED)
- [x] #85890 - Reverted in 4e54f376e07071f84ed283e7468e334aaf6e4e02
- [x] #86046 - Reverted in 0bbe2c9a048c229d151682e08aca1fa176c3ad91
- [x] #86008 - Reverted in a0a0635cd6618618c49fda7cf150231d62a14236
- [x] #86042 - Reverted in fa376315a064b945ed9846225c7f48e38e9b55ed
- [x] #85891 - Reverted in 603dcd691e9eaad0a610c60c94fee522391bd2b3
- [x] #86040 - Reverted in e42fc7618194b4b01cb68ca0c61385e465d0cb05
- [x] #86025 - Reverted in 536bb25fe91845fe05bb7d512d8e73cc193b67ff
- [x] #86012 - Reverted in 5cb4ec5bdf87653a5bb651c536f21423db30887e
- [x] #86004 - Reverted in e9536143e78e3b0614d3ce6ee2c9a40005ba9b91
- [x] #85989 - Reverted in 88a92322c2f028d2e3a2be18951d35d1135a6268
- [x] #86044 - Reverted in d0a5fb5956be23144e325d3d51f53cb103dd5bbe
- [x] #86001 - Reverted in 195c3597044315c9b10d002e6196911ac0622c45
- [x] #86030 - Reverted in 5265796286b481d34fc91a1f8c58b6373d23415e
- [x] #86055 - Reverted in e82138798cda028b673fe7ac83890e5a6b9e16d2
- [x] #86057 - Reverted in c921900e6151552aa0768b4c9d7cc58c58dfbcc0
- [x] #86014 - Reverted in c004d4e989a2faa672793f58fd98bd6fded8194e
- [x] #85304 - Reverted in 611510bd7f65ee06738b7344326d72f57a131f8a
- [x] #86061 - Reverted in f14b0a245dcf164bb99f7696e180847bb5be9b11
- [x] #86075 - Reverted in 5339fe6c098d48769eda3f9935aa3488faa73097
- [x] #86089 - Reverted in 10b5398e6b55f4799ca7d6740ac50c031e157c43
- [x] #86081 - Reverted in ba86f43383cd2e8417c0a465c23fe3227fcd5520
- [x] #85609 - Reverted in 9e5208feaca3163b7f4237c316d880161933777f
- [x] #86114 - Reverted in cf410a97b8348381f96cc784a6489d7c1dea49ba
- [x] #86023 - Reverted in a7a2e95c0c1b0598f15019934c80ccc80a9f89af
- [x] #86027 - Reverted in 9cf71611befac64d26d326c060ef082262aeca70
- [x] #86016 - Reverted in b67fa06e1559c8de87899bd06d09891b4c7ae947
- [x] #86095 - Reverted in dc5abd827bb56e1609afe5a9d2bdd957d40cc75c
- [x] #86105 - Reverted in f5b8e7ecbe99cb38e829a98a4f6eb2c200af8b91
- [x] #86070 - Reverted in 6c460bbc22827bdbc566b524b8e6a959cbb61c37
After that some startup commits on this branch need to be reverted then
it can be merged.
---------
Co-authored-by: tgstation-ci <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: MrMelbert <kmelbert4@gmail.com>
611 lines
22 KiB
Plaintext
611 lines
22 KiB
Plaintext
/// This controls the delay for the sculpt rock breaking sound
|
|
/// Every 4th iterator while sculpting will emit a sound (rougly every couple of seconds)
|
|
#define SCULPT_SOUND_INCREMENT 4
|
|
|
|
/obj/structure/statue
|
|
name = "statue"
|
|
desc = "Placeholder. Yell at Firecage if you SOMEHOW see this."
|
|
icon = 'icons/obj/art/statue.dmi'
|
|
icon_state = ""
|
|
density = TRUE
|
|
anchored = FALSE
|
|
max_integrity = 100
|
|
can_atmos_pass = ATMOS_PASS_DENSITY
|
|
material_modifier = 0.5
|
|
material_flags = MATERIAL_EFFECTS | MATERIAL_AFFECT_STATISTICS
|
|
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
|
|
/// Beauty component mood modifier
|
|
var/impressiveness = 15
|
|
/// Art component subtype added to this statue
|
|
var/art_type = /datum/element/art
|
|
/// Abstract root type
|
|
var/abstract_type = /obj/structure/statue
|
|
|
|
/obj/structure/statue/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(art_type, impressiveness)
|
|
AddElement(/datum/element/beauty, impressiveness * 75)
|
|
AddComponent(/datum/component/simple_rotation)
|
|
AddComponent(/datum/component/marionette)
|
|
|
|
/obj/structure/statue/wrench_act(mob/living/user, obj/item/tool)
|
|
. = ..()
|
|
default_unfasten_wrench(user, tool)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
/obj/structure/statue/attackby(obj/item/W, mob/living/user, params)
|
|
add_fingerprint(user)
|
|
if(W.tool_behaviour == TOOL_WELDER)
|
|
if(!W.tool_start_check(user, amount=1))
|
|
return FALSE
|
|
user.balloon_alert(user, "slicing apart...")
|
|
if(W.use_tool(src, user, 40, volume=50))
|
|
deconstruct(TRUE)
|
|
return
|
|
return ..()
|
|
|
|
|
|
/obj/structure/statue/atom_deconstruct(disassembled = TRUE)
|
|
var/amount_mod = disassembled ? 0 : -2
|
|
for(var/mat in custom_materials)
|
|
var/datum/material/custom_material = GET_MATERIAL_REF(mat)
|
|
var/amount = max(0,round(custom_materials[mat]/SHEET_MATERIAL_AMOUNT) + amount_mod)
|
|
if(amount > 0)
|
|
new custom_material.sheet_type(drop_location(), amount)
|
|
|
|
//////////////////////////////////////STATUES/////////////////////////////////////////////////////////////
|
|
////////////////////////uranium///////////////////////////////////
|
|
|
|
/obj/structure/statue/uranium
|
|
max_integrity = 300
|
|
// largish, dim green glow
|
|
light_range = 3
|
|
light_power = 0.7
|
|
light_color = LIGHT_COLOR_NUCLEAR
|
|
custom_materials = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT*5)
|
|
impressiveness = 25 // radiation makes an impression
|
|
abstract_type = /obj/structure/statue/uranium
|
|
|
|
/obj/structure/statue/uranium/nuke
|
|
name = "statue of a nuclear fission explosive"
|
|
desc = "This is a grand statue of a Nuclear Explosive. It has a sickening green colour."
|
|
icon_state = "nuke"
|
|
|
|
/obj/structure/statue/uranium/eng
|
|
name = "Statue of an engineer"
|
|
desc = "This statue has a sickening green colour."
|
|
icon_state = "eng"
|
|
|
|
////////////////////////////plasma///////////////////////////////////////////////////////////////////////
|
|
|
|
/obj/structure/statue/plasma
|
|
max_integrity = 200
|
|
impressiveness = 20
|
|
desc = "This statue is suitably made from plasma."
|
|
custom_materials = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/plasma
|
|
|
|
/obj/structure/statue/plasma/scientist
|
|
name = "statue of a scientist"
|
|
icon_state = "sci"
|
|
|
|
/obj/structure/statue/plasma/xeno
|
|
name = "statue of a xenomorph"
|
|
icon_state = "xeno"
|
|
|
|
//////////////////////gold///////////////////////////////////////
|
|
|
|
/obj/structure/statue/gold
|
|
max_integrity = 300
|
|
impressiveness = 25
|
|
desc = "This is a highly valuable statue made from gold."
|
|
custom_materials = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/gold
|
|
|
|
/obj/structure/statue/gold/hos
|
|
name = "statue of the head of security"
|
|
icon_state = "hos"
|
|
|
|
/obj/structure/statue/gold/hop
|
|
name = "statue of the head of personnel"
|
|
icon_state = "hop"
|
|
|
|
/obj/structure/statue/gold/cmo
|
|
name = "statue of the chief medical officer"
|
|
icon_state = "cmo"
|
|
|
|
/obj/structure/statue/gold/ce
|
|
name = "statue of the chief engineer"
|
|
icon_state = "ce"
|
|
|
|
/obj/structure/statue/gold/rd
|
|
name = "statue of the research director"
|
|
icon_state = "rd"
|
|
|
|
/obj/structure/statue/gold/qm
|
|
name = "statue of the quartermaster"
|
|
icon_state = "qm"
|
|
|
|
//////////////////////////silver///////////////////////////////////////
|
|
|
|
/obj/structure/statue/silver
|
|
max_integrity = 300
|
|
impressiveness = 25
|
|
desc = "This is a valuable statue made from silver."
|
|
custom_materials = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/silver
|
|
|
|
/obj/structure/statue/silver/md
|
|
name = "statue of a medical officer"
|
|
icon_state = "md"
|
|
|
|
/obj/structure/statue/silver/janitor
|
|
name = "statue of a janitor"
|
|
icon_state = "jani"
|
|
|
|
/obj/structure/statue/silver/sec
|
|
name = "statue of a security officer"
|
|
icon_state = "sec"
|
|
|
|
/obj/structure/statue/silver/secborg
|
|
name = "statue of a security cyborg"
|
|
icon_state = "secborg"
|
|
|
|
/obj/structure/statue/silver/medborg
|
|
name = "statue of a medical cyborg"
|
|
icon_state = "medborg"
|
|
|
|
/////////////////////////diamond/////////////////////////////////////////
|
|
|
|
/obj/structure/statue/diamond
|
|
max_integrity = 1000
|
|
impressiveness = 50
|
|
desc = "This is a very expensive diamond statue."
|
|
custom_materials = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/diamond
|
|
|
|
/obj/structure/statue/diamond/captain
|
|
name = "statue of THE captain."
|
|
icon_state = "cap"
|
|
|
|
/obj/structure/statue/diamond/ai1
|
|
name = "statue of the AI hologram."
|
|
icon_state = "ai1"
|
|
|
|
/obj/structure/statue/diamond/ai2
|
|
name = "statue of the AI core."
|
|
icon_state = "ai2"
|
|
|
|
////////////////////////bananium///////////////////////////////////////
|
|
|
|
/obj/structure/statue/bananium
|
|
max_integrity = 300
|
|
impressiveness = 50
|
|
desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
|
|
custom_materials = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/bananium
|
|
|
|
/obj/structure/statue/bananium/clown
|
|
name = "statue of a clown"
|
|
icon_state = "clown"
|
|
|
|
/////////////////////sandstone/////////////////////////////////////////
|
|
|
|
/obj/structure/statue/sandstone
|
|
max_integrity = 50
|
|
impressiveness = 15
|
|
custom_materials = list(/datum/material/sandstone=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/sandstone
|
|
|
|
/obj/structure/statue/sandstone/assistant
|
|
name = "statue of an assistant"
|
|
desc = "A cheap statue of sandstone for a greyshirt."
|
|
icon_state = "assist"
|
|
|
|
|
|
/obj/structure/statue/sandstone/venus //call me when we add marble i guess
|
|
name = "statue of a pure maiden"
|
|
desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though."
|
|
icon = 'icons/obj/art/statuelarge.dmi'
|
|
icon_state = "venus"
|
|
|
|
/////////////////////snow/////////////////////////////////////////
|
|
|
|
/obj/structure/statue/snow
|
|
max_integrity = 50
|
|
custom_materials = list(/datum/material/snow=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/snow
|
|
|
|
/obj/structure/statue/snow/snowman
|
|
name = "snowman"
|
|
desc = "Several lumps of snow put together to form a snowman."
|
|
icon_state = "snowman"
|
|
|
|
/obj/structure/statue/snow/snowlegion
|
|
name = "snowlegion"
|
|
desc = "Looks like that weird kid with the tiger plushie has been round here again."
|
|
icon_state = "snowlegion"
|
|
|
|
///////////////////////////////bronze///////////////////////////////////
|
|
|
|
/obj/structure/statue/bronze
|
|
custom_materials = list(/datum/material/bronze=SHEET_MATERIAL_AMOUNT*5)
|
|
abstract_type = /obj/structure/statue/bronze
|
|
|
|
/obj/structure/statue/bronze/marx
|
|
name = "\improper Karl Marx bust"
|
|
desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the station."
|
|
icon_state = "marx"
|
|
art_type = /datum/element/art/rev
|
|
|
|
///////////Elder Atmosian///////////////////////////////////////////
|
|
|
|
/obj/structure/statue/elder_atmosian
|
|
name = "Elder Atmosian"
|
|
desc = "A statue of an Elder Atmosian, capable of bending the laws of thermodynamics to their will."
|
|
icon_state = "eng"
|
|
custom_materials = list(/datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT*10)
|
|
max_integrity = 1000
|
|
impressiveness = 100
|
|
abstract_type = /obj/structure/statue/elder_atmosian //This one is uncarvable
|
|
|
|
///////////Goliath//////////////////////////////////////////////////
|
|
/obj/structure/statue/goliath
|
|
desc = "A lifelike statue of a horrifying monster."
|
|
icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi'
|
|
icon_state = "goliath"
|
|
pixel_x = -12
|
|
base_pixel_x = -12
|
|
name = "goliath"
|
|
|
|
///////////Other Stuff//////////////////////////////////////////////
|
|
/obj/item/chisel
|
|
name = "chisel"
|
|
desc = "Breaking and making art since 4000 BC. This one uses advanced technology to allow the creation of lifelike moving statues."
|
|
icon = 'icons/obj/art/statue.dmi'
|
|
icon_state = "chisel"
|
|
inhand_icon_state = "screwdriver_nuke"
|
|
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
slot_flags = ITEM_SLOT_BELT
|
|
force = 5
|
|
w_class = WEIGHT_CLASS_TINY
|
|
throwforce = 5
|
|
throw_speed = 3
|
|
throw_range = 5
|
|
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.75)
|
|
attack_verb_continuous = list("stabs")
|
|
attack_verb_simple = list("stab")
|
|
hitsound = 'sound/weapons/bladeslice.ogg'
|
|
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
|
|
drop_sound = 'sound/items/handling/screwdriver_drop.ogg'
|
|
pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg'
|
|
sharpness = SHARP_POINTY
|
|
tool_behaviour = TOOL_RUSTSCRAPER
|
|
toolspeed = 3 // You're gonna have a bad time
|
|
|
|
/// Block we're currently carving in
|
|
var/obj/structure/carving_block/prepared_block
|
|
/// If tracked user moves we stop sculpting
|
|
var/mob/living/tracked_user
|
|
/// Currently sculpting
|
|
var/sculpting = FALSE
|
|
|
|
/obj/item/chisel/Initialize(mapload)
|
|
. = ..()
|
|
AddElement(/datum/element/eyestab)
|
|
AddElement(/datum/element/wall_engraver)
|
|
//deals 200 damage to statues, meaning you can actually kill one in ~250 hits
|
|
AddElement(/datum/element/bane, target_type = /mob/living/basic/statue, damage_multiplier = 40)
|
|
|
|
/obj/item/chisel/Destroy()
|
|
prepared_block = null
|
|
tracked_user = null
|
|
return ..()
|
|
|
|
/*
|
|
Hit the block to start
|
|
Point with the chisel at the target to choose what to sculpt or hit block to choose from preset statue types.
|
|
Hit block again to start sculpting.
|
|
Moving interrupts
|
|
*/
|
|
/obj/item/chisel/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
|
|
if(sculpting)
|
|
return ITEM_INTERACT_BLOCKING
|
|
if(istype(interacting_with, /obj/structure/carving_block))
|
|
var/obj/structure/carving_block/sculpt_block = interacting_with
|
|
|
|
if(sculpt_block.completion) // someone already started sculpting this so just finish
|
|
set_block(sculpt_block, user, silent = TRUE)
|
|
start_sculpting(user)
|
|
else if(sculpt_block == prepared_block && (prepared_block.current_target || prepared_block.current_preset_type))
|
|
start_sculpting(user)
|
|
else if(!prepared_block)
|
|
set_block(sculpt_block, user)
|
|
else if(sculpt_block == prepared_block)
|
|
show_generic_statues_prompt(user)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
else if(prepared_block) //We're aiming at something next to us with block prepared
|
|
prepared_block.set_target(interacting_with, user)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
return NONE
|
|
|
|
// We aim at something distant.
|
|
/obj/item/chisel/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
|
|
if (!sculpting && prepared_block && ismovable(interacting_with) && prepared_block.completion == 0)
|
|
prepared_block.set_target(interacting_with, user)
|
|
return ITEM_INTERACT_SUCCESS
|
|
return ITEM_INTERACT_BLOCKING
|
|
|
|
/// Starts or continues the sculpting action on the carving block material
|
|
/obj/item/chisel/proc/start_sculpting(mob/living/user)
|
|
user.balloon_alert(user, "sculpting block...")
|
|
playsound(src, pick(usesound), 75, TRUE)
|
|
sculpting = TRUE
|
|
//How long whole process takes
|
|
var/sculpting_time = 30 SECONDS
|
|
//Single interruptible progress period
|
|
var/sculpting_period = round(sculpting_time / world.icon_size) //this is just so it reveals pixels line by line for each.
|
|
var/interrupted = FALSE
|
|
var/remaining_time = sculpting_time - (prepared_block.completion * sculpting_time)
|
|
|
|
var/datum/progressbar/total_progress_bar = new(user, sculpting_time, prepared_block)
|
|
while(remaining_time > 0 && !interrupted)
|
|
if(do_after(user, sculpting_period, target = prepared_block, progress = FALSE))
|
|
var/time_delay = !(remaining_time % SCULPT_SOUND_INCREMENT)
|
|
if(time_delay)
|
|
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE)
|
|
remaining_time -= sculpting_period
|
|
prepared_block.set_completion((sculpting_time - remaining_time)/sculpting_time)
|
|
total_progress_bar.update(sculpting_time - remaining_time)
|
|
else
|
|
interrupted = TRUE
|
|
total_progress_bar.end_progress()
|
|
if(!interrupted && !QDELETED(prepared_block))
|
|
prepared_block.create_statue()
|
|
user.balloon_alert(user, "statue finished")
|
|
stop_sculpting(silent = !interrupted)
|
|
|
|
/// To setup the sculpting target for the carving block
|
|
/obj/item/chisel/proc/set_block(obj/structure/carving_block/B, mob/living/user, silent = FALSE)
|
|
prepared_block = B
|
|
tracked_user = user
|
|
RegisterSignal(tracked_user, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
|
|
if(!silent)
|
|
user.balloon_alert(user, "select sculpt target")
|
|
|
|
/obj/item/chisel/dropped(mob/user, silent)
|
|
. = ..()
|
|
stop_sculpting()
|
|
|
|
/// Cancel the sculpting action
|
|
/obj/item/chisel/proc/stop_sculpting(silent = FALSE)
|
|
sculpting = FALSE
|
|
if(prepared_block && prepared_block.completion == 0)
|
|
prepared_block.reset_target()
|
|
prepared_block = null
|
|
|
|
if(!silent && tracked_user)
|
|
tracked_user.balloon_alert(tracked_user, "sculpting cancelled!")
|
|
|
|
if(tracked_user)
|
|
UnregisterSignal(tracked_user, COMSIG_MOVABLE_MOVED)
|
|
tracked_user = null
|
|
|
|
/obj/item/chisel/proc/on_moved()
|
|
SIGNAL_HANDLER
|
|
|
|
stop_sculpting()
|
|
|
|
/obj/item/chisel/proc/show_generic_statues_prompt(mob/living/user)
|
|
var/list/choices = list()
|
|
for(var/statue_path in prepared_block.get_possible_statues())
|
|
var/obj/structure/statue/abstract_statue = statue_path
|
|
choices[statue_path] = image(icon = initial(abstract_statue.icon), icon_state = initial(abstract_statue.icon_state))
|
|
if(!choices.len)
|
|
user.balloon_alert(user, "no abstract statues for material!")
|
|
|
|
var/choice = show_radial_menu(user, prepared_block, choices, require_near = TRUE)
|
|
if(choice)
|
|
prepared_block.current_preset_type = choice
|
|
var/image/chosen_looks = choices[choice]
|
|
prepared_block.current_target = chosen_looks.appearance
|
|
user.balloon_alert(user, "abstract statue selected")
|
|
|
|
/obj/structure/carving_block
|
|
name = "block"
|
|
desc = "Ready for sculpting."
|
|
icon = 'icons/obj/art/statue.dmi'
|
|
icon_state = "block"
|
|
material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS | MATERIAL_ADD_PREFIX
|
|
density = TRUE
|
|
material_modifier = 0.5 //50% effectiveness of materials
|
|
|
|
/// The thing it will look like - Unmodified resulting statue appearance
|
|
var/current_target
|
|
/// Currently chosen preset statue type
|
|
var/current_preset_type
|
|
//Table of required materials for each non-abstract statue type
|
|
var/static/list/statue_costs
|
|
/// statue completion from 0 to 1.0
|
|
var/completion = 0
|
|
/// Greyscaled target with cutout filter
|
|
var/mutable_appearance/target_appearance_with_filters
|
|
/// HSV color filters parameters
|
|
var/static/list/greyscale_with_value_bump = list(0,0,0, 0,0,0, 0,0,1, 0,0,-0.05)
|
|
|
|
/obj/structure/carving_block/Destroy()
|
|
current_target = null
|
|
target_appearance_with_filters = null
|
|
return ..()
|
|
|
|
/obj/structure/carving_block/proc/set_target(atom/movable/target, mob/living/user)
|
|
if(!is_viable_target(user, target))
|
|
return
|
|
if(istype(target,/obj/structure/statue/custom))
|
|
var/obj/structure/statue/custom/original = target
|
|
current_target = original.content_ma
|
|
else
|
|
current_target = target.appearance
|
|
var/mutable_appearance/ma = current_target
|
|
user.balloon_alert(user, "sculpt target is [ma.name]")
|
|
|
|
/obj/structure/carving_block/proc/reset_target()
|
|
current_target = null
|
|
current_preset_type = null
|
|
target_appearance_with_filters = null
|
|
|
|
/obj/structure/carving_block/update_overlays()
|
|
. = ..()
|
|
if(!target_appearance_with_filters)
|
|
return
|
|
//We're only keeping one instance here that changes in the middle so we have to clone it to avoid managed overlay issues
|
|
var/mutable_appearance/clone = new(target_appearance_with_filters)
|
|
. += clone
|
|
|
|
/obj/structure/carving_block/proc/is_viable_target(mob/living/user, atom/movable/target)
|
|
//Only things on turfs
|
|
if(!isturf(target.loc))
|
|
user.balloon_alert(user, "no sculpt target!")
|
|
return FALSE
|
|
//No big icon things
|
|
var/list/icon_dimensions = get_icon_dimensions(target.icon)
|
|
if(icon_dimensions["width"] != world.icon_size || icon_dimensions["height"] != world.icon_size)
|
|
user.balloon_alert(user, "sculpt target is too big!")
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/obj/structure/carving_block/proc/create_statue()
|
|
if(current_preset_type)
|
|
var/obj/structure/statue/preset_statue = new current_preset_type(get_turf(src))
|
|
preset_statue.set_custom_materials(custom_materials)
|
|
qdel(src)
|
|
else if(current_target)
|
|
var/obj/structure/statue/custom/new_statue = new(get_turf(src))
|
|
new_statue.set_visuals(current_target)
|
|
new_statue.set_custom_materials(custom_materials)
|
|
var/mutable_appearance/ma = current_target
|
|
new_statue.name = "statue of [ma.name]"
|
|
new_statue.desc = "A carved statue depicting [ma.name]."
|
|
qdel(src)
|
|
|
|
/obj/structure/carving_block/proc/set_completion(value)
|
|
if(!current_target)
|
|
return
|
|
if(!target_appearance_with_filters)
|
|
target_appearance_with_filters = new(current_target)
|
|
// KEEP_APART in case carving block gets KEEP_TOGETHER from somewhere like material texture filters.
|
|
target_appearance_with_filters.appearance_flags |= KEEP_TOGETHER | KEEP_APART
|
|
//Doesn't use filter helpers because MAs aren't atoms
|
|
target_appearance_with_filters.filters = filter(type="color",color=greyscale_with_value_bump,space=FILTER_COLOR_HSV)
|
|
completion = value
|
|
var/static/icon/white = icon('icons/effects/alphacolors.dmi', "white")
|
|
switch(value)
|
|
if(0)
|
|
//delete uncovered and reset filters
|
|
remove_filter("partial_uncover")
|
|
target_appearance_with_filters = null
|
|
else
|
|
var/mask_offset = min(world.icon_size,round(completion * world.icon_size))
|
|
remove_filter("partial_uncover")
|
|
add_filter("partial_uncover", 1, alpha_mask_filter(icon = white, y = -mask_offset))
|
|
target_appearance_with_filters.filters = filter(type="alpha",icon=white,y=-mask_offset,flags=MASK_INVERSE)
|
|
update_appearance()
|
|
|
|
|
|
/// Returns a list of preset statues carvable from this block depending on the custom materials
|
|
/obj/structure/carving_block/proc/get_possible_statues()
|
|
. = list()
|
|
if(!statue_costs)
|
|
statue_costs = build_statue_cost_table()
|
|
for(var/statue_path in statue_costs)
|
|
var/list/carving_cost = statue_costs[statue_path]
|
|
var/enough_materials = TRUE
|
|
for(var/required_material in carving_cost)
|
|
if(!has_material_type(required_material, carving_cost[required_material]))
|
|
enough_materials = FALSE
|
|
break
|
|
if(enough_materials)
|
|
. += statue_path
|
|
|
|
/obj/structure/carving_block/proc/build_statue_cost_table()
|
|
. = list()
|
|
for(var/statue_type in subtypesof(/obj/structure/statue) - /obj/structure/statue/custom)
|
|
var/obj/structure/statue/S = new statue_type()
|
|
if(!S.icon_state || S.abstract_type == S.type || !S.custom_materials)
|
|
continue
|
|
.[S.type] = S.custom_materials
|
|
qdel(S)
|
|
|
|
/obj/structure/statue/custom
|
|
name = "custom statue"
|
|
icon_state = "base"
|
|
obj_flags = CAN_BE_HIT | UNIQUE_RENAME
|
|
appearance_flags = TILE_BOUND | PIXEL_SCALE | KEEP_TOGETHER | LONG_GLIDE //Added keep together in case targets has weird layering
|
|
material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
|
|
/// primary statue overlay
|
|
var/mutable_appearance/content_ma
|
|
var/static/list/greyscale_with_value_bump = list(0,0,0, 0,0,0, 0,0,1, 0,0,-0.05)
|
|
|
|
/obj/structure/statue/custom/Destroy()
|
|
content_ma = null
|
|
return ..()
|
|
|
|
/obj/structure/statue/custom/proc/set_visuals(model_appearance)
|
|
if(content_ma)
|
|
QDEL_NULL(content_ma)
|
|
content_ma = new
|
|
content_ma.appearance = model_appearance
|
|
content_ma.pixel_x = 0
|
|
content_ma.pixel_y = 0
|
|
content_ma.alpha = 255
|
|
|
|
var/static/list/plane_whitelist = list(FLOAT_PLANE, GAME_PLANE, FLOOR_PLANE)
|
|
|
|
/// Ideally we'd have knowledge what we're removing but i'd have to be done on target appearance retrieval
|
|
var/list/overlays_to_keep = list()
|
|
for(var/mutable_appearance/special_overlay as anything in content_ma.overlays)
|
|
var/mutable_appearance/real = new()
|
|
real.appearance = special_overlay
|
|
if(PLANE_TO_TRUE(real.plane) in plane_whitelist)
|
|
overlays_to_keep += real
|
|
content_ma.overlays = overlays_to_keep
|
|
|
|
var/list/underlays_to_keep = list()
|
|
for(var/mutable_appearance/special_underlay as anything in content_ma.underlays)
|
|
var/mutable_appearance/real = new()
|
|
real.appearance = special_underlay
|
|
if(PLANE_TO_TRUE(real.plane) in plane_whitelist)
|
|
underlays_to_keep += real
|
|
content_ma.underlays = underlays_to_keep
|
|
|
|
content_ma.appearance_flags &= ~KEEP_APART //Don't want this
|
|
content_ma.filters = filter(type="color",color=greyscale_with_value_bump,space=FILTER_COLOR_HSV)
|
|
update_content_planes()
|
|
update_appearance()
|
|
|
|
/obj/structure/statue/custom/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
|
|
if(same_z_layer)
|
|
return ..()
|
|
update_content_planes()
|
|
update_appearance()
|
|
|
|
/obj/structure/statue/custom/proc/update_content_planes()
|
|
if(!content_ma)
|
|
return
|
|
var/turf/our_turf = get_turf(src)
|
|
// MA's stored in the overlays list are not actually mutable, they've been flattened
|
|
// This proc unflattens them, updates them, and then reapplies
|
|
var/list/created = update_appearance_planes(list(content_ma), GET_TURF_PLANE_OFFSET(our_turf))
|
|
content_ma = created[1]
|
|
|
|
/obj/structure/statue/custom/update_overlays()
|
|
. = ..()
|
|
if(content_ma)
|
|
. += content_ma
|
|
|
|
#undef SCULPT_SOUND_INCREMENT
|