Commit Graph

9983 Commits

Author SHA1 Message Date
Razgriz
3a23ec5ba2 Merge pull request #3650 from CHOMPStation2/upstream-merge-12188
[MIRROR] Size Standardization Bracelet
2022-02-13 01:16:22 -07:00
Verkister
86e18daa98 Update watercloset_vr.dm 2022-02-10 14:24:01 +02:00
Verkister
8f1bac9cdc Couple more flush tweaks.
Fixes an oversight of picking up or moving contents off the tile mid-animation not saving them from getting flushed.
Also makes it possible to flush small (unbuckled and knocked down) mobs up to 75% size :v
2022-02-10 14:20:56 +02:00
Casey
a503fa1c7f Merge pull request #12188 from Very-Soft/yeah!
Size Standardization Bracelet
2022-02-10 00:57:10 +00:00
Razgriz
350c8be012 Merge pull request #3641 from Holdelta/materials-update
Update to Sheet Materials
2022-02-08 14:19:40 -07:00
Test Turtle
3c06b4dc19 Update to Sheet Materials
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
2022-02-07 17:20:45 -08:00
Verkister
15c9d5973a Instead of instantly just zapping the contents away, they now swirl the stuff around before making it vanish one item at a time, keeping the things contained for a 20 sec cooldown time before it gets zapped to the exit landmark, this serving as both, spam protection and a chance for the possible player victim to watch the action finish before they're bluespaced away.
Also makes the exit landmark use a new contained item retrieval system instead of just making a messy lagpile in the open. The machine also processes down certain things, these icluding foods, organs, and vore eggs, making the thing not be useful as a food vendor for your dear enemies, and popping open vore eggs so that nobody needs to end up blindly guessing mystery contents. Also the machine has a funny little feature to get rid of the unwanted contents as well. (SPOILERS: it's a "Muffin Monster" mode with a twist. The monster is an actual voremob contained within the machine, and if active, the contents will end up in its gut. Deactivating will release the contents back into the machine. Sounds like some sorta Bethesda level brainfart, right? But I did it on purpose for another even funnier feature: Emagging the machine while the mode is active will release the monster as a hostile mob lmao)

Not even gonna bother marking as chompedit for now cause it was already all my code and I doubt anyone else up there's gonna be touching the file and might just end up porting it there anyway if I somehow get a charitable urge to provide them with non-critical funfeatures again :v
2022-02-07 21:38:55 +02:00
Nadyr
524db7ba79 Merge pull request #3625 from CHOMPStation2/upstream-merge-12164
[MIRROR] talon miner
2022-02-06 21:58:06 -05:00
Nadyr
77f4e9fb63 Merge pull request #3627 from CHOMPStation2/upstream-merge-12144
[MIRROR] exosuit cargo expansion equipment
2022-02-06 21:51:00 -05:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
5eff6c2f63 Merge branch 'master' into upstream-merge-12158 2022-02-06 20:56:50 -05:00
Nadyr
03bae00061 Merge pull request #3616 from CHOMPStation2/upstream-merge-12151
[MIRROR] adds a catslug crate to cargo
2022-02-06 20:40:53 -05:00
Nadyr
4efce5f15f Merge pull request #3615 from CHOMPStation2/upstream-merge-12146
[MIRROR] skimpy cap "dress" probably more like a leotard idk
2022-02-06 20:36:30 -05:00
Nadyr
6bc18000c5 Merge pull request #3611 from CHOMPStation2/upstream-merge-12143
[MIRROR] Return to Tether
2022-02-06 20:03:12 -05:00
Casey
1eabc49fc5 Merge pull request #12144 from Hatterhat/special-compartment
exosuit cargo expansion equipment
2022-02-06 23:23:09 +00:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
56d47d2cc1 Item Bank fixy! 2022-02-06 15:46:27 +00:00
Casey
b77383ecce Merge pull request #12151 from PastelPrinceDan/catslugcrate
adds a catslug crate to cargo
2022-02-06 14:16:18 +00:00
Casey
86ca5e5d49 Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense
skimpy cap "dress" probably more like a leotard idk
2022-02-06 14:15:06 +00:00
Casey
7f3da20187 Talon Improvements, Take 2 2022-02-06 14:07:23 +00:00
Casey
d38c2c3ac3 Return to Tether 2022-02-06 14:05:08 +00:00
Verkister
921c1d6337 Possibly fixes some spiderling jank
Ran out of brain juice trying to figure out the bugginess further but the wacky placement of this stuff got me sussy enough to try something. will see if anything happens and maybe toss upstream if so.

If my hunch is correct this might fix excess unregistered spiderling spawning and the bug with infinitely squishable undeleted squishees.
2022-02-03 19:08:30 +02:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs
Porting a hefty chunk of Citadel mobs.
2022-01-29 17:09:18 -05:00
Nadyr
bffc119058 Merge pull request #3585 from CHOMPStation2/upstream-merge-12081
[MIRROR] Makes pocky not leave behind trash gum
2022-01-22 10:46:13 -05:00
Novacat
9ec8187e24 Merge pull request #12081 from Heroman3003/pockygum
Makes pocky not leave behind trash gum
2022-01-22 14:24:26 +00:00
Novacat
6993d13559 Merge pull request #12080 from Heroman3003/lowall
Fixes wrench dropping when deconstructing low wall + allows normal climbing
2022-01-22 14:19:06 +00:00
TheGreatKitsune
9e4d45c9ac Vox revival properly 2022-01-18 14:27:15 -06:00
TheGreatKitsune
6547e6e21e Enable reviving vox 2022-01-18 14:20:56 -06:00
Casey
9460986025 Merge pull request #12061 from Very-Soft/spoilers
Removes the announcement for main pred and morph spawns
2022-01-14 18:45:25 +00:00
Nadyr
d8fe29d97a Merge pull request #3533 from CHOMPStation2/upstream-merge-12029
[MIRROR] more stuff fits on toolbelts of holding take 2 because i fucked up somewhere
2022-01-09 20:45:32 -05:00
Nadyr
c5c1bf0b8a Merge pull request #3531 from CHOMPStation2/upstream-merge-12030
[MIRROR] Adjusts descriptions and flavor texts of painting frames
2022-01-09 20:20:12 -05:00
Nadyr
97e80df2a7 Merge branch 'master' into upstream-merge-12029 2022-01-09 20:18:25 -05:00
Casey
61a2292fc2 Merge pull request #12013 from Hatterhat/patch-5
inducer on holding belt
2022-01-09 01:52:31 +00:00
Casey
a84c109a45 more stuff fits on toolbelts of holding take 2 because i fucked up somewhere 2022-01-09 01:51:08 +00:00
Casey
e3e993aed6 Merge pull request #12030 from Heroman3003/artfix
Adjusts descriptions and flavor texts of painting frames
2022-01-09 01:50:51 +00:00
Nadyr
9a88c804a0 Merge pull request #3500 from Shadowfire117/master
Merry Christmas
2021-12-20 20:36:09 -05:00
Shadow
79d8f74895 Merry Christmas!
Many more enjoyable items to gain from the chomp christmas present, now with new pretty sprites
new casino specific headset for the hardworking casino crew to use
Fixed issue with teshari collar not appearing when wearing casino prize collar
made the SPASM disconnected variant of the casino slave collar function as holo so easier to set new tag
Fixed issue with non-visible casino crew ids
new spawner grenade that spawns a gorilla, and not the fur covered monkey kind!
Added a lot of new prizes to buy from the casino prize dispenser
Rebalanced money regained from converting chips back into thalers at the chips exchanger
2021-12-21 00:31:15 +01:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
Nadyr
ec3d95f7ba Merge pull request #3487 from CHOMPStation2/upstream-merge-12005
[MIRROR] Makes your balls better
2021-12-12 06:44:42 -05:00
Nadyr
970000bbc4 Merge pull request #3486 from CHOMPStation2/upstream-merge-12004
[MIRROR] Limits painting name length to 250 characters
2021-12-12 06:44:23 -05:00
Nadyr
c9da082ac9 Merge pull request #3265 from CHOMPStation2/upstream-merge-11960
[MIRROR] Another capture crystal tweak
2021-12-12 06:31:54 -05:00
Nadyr
1141e96505 Merge pull request #3295 from CHOMPStation2/upstream-merge-11975
[MIRROR] Door Interact Tweaks
2021-12-12 06:28:53 -05:00
Nadyr
dfdf720ee9 Merge pull request #3301 from CHOMPStation2/upstream-merge-11968
[MIRROR] Allows simplemobs climb ladders + trash pile interaction fix
2021-12-12 06:22:42 -05:00
Nadyr
56829b92c8 Merge branch 'master' into upstream-merge-11960 2021-12-12 06:19:17 -05:00
Nadyr
9f2ede544d Merge pull request #3267 from CHOMPStation2/upstream-merge-11955
[MIRROR] Tweak capture crystal
2021-12-12 06:08:46 -05:00
Nadyr
b796814d3c Merge pull request #3473 from CHOMPStation2/upstream-merge-11878
[MIRROR] Fix for issue #5643
2021-12-12 06:05:03 -05:00
Nadyr
001ca8885f Merge branch 'master' into upstream-merge-11848 2021-12-12 05:43:50 -05:00
Nadyr
b6e1741f11 Merge pull request #3447 from CHOMPStation2/upstream-merge-11842
[MIRROR] SpaceVines - Now with 100% More Landmark Moments
2021-12-12 05:39:43 -05:00
Nadyr
97270ba71c Merge pull request #3439 from CHOMPStation2/upstream-merge-11832
[MIRROR] mechaport gaming
2021-12-12 04:59:33 -05:00
Nadyr
5c2cdb3d5e Merge pull request #3433 from CHOMPStation2/upstream-merge-11821
[MIRROR] Adds Altevian Language & ATC Fluff
2021-12-12 04:46:37 -05:00