Casey
8c92de9c99
Update CONTRIBUTING.md
2022-02-11 21:47:06 +00:00
Razgriz
e945df9fc6
Merge pull request #3651 from Verkister/waterslide
...
Couple more flush tweaks.
2022-02-10 12:23:37 -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
Razgriz
4544be7d02
Merge pull request #3642 from CHOMPStation2/nanomaps_generation
...
Automatic NanoMap Update
2022-02-08 14:20:49 -07:00
Razgriz
350c8be012
Merge pull request #3641 from Holdelta/materials-update
...
Update to Sheet Materials
2022-02-08 14:19:40 -07:00
Razgriz
813294001d
Merge pull request #3639 from CHOMPStation2/upstream-merge-12174
...
[MIRROR] Hastily gives the ERT their suits back
2022-02-08 14:18:58 -07:00
Razgriz
5c34b3482c
Merge pull request #3638 from CHOMPStation2/upstream-merge-12173
...
[MIRROR] Allergen Reaction Tuning
2022-02-08 14:18:06 -07:00
NanoMap Generation
f6cf10959e
NanoMap Auto-Update (Tue Feb 8 21:17:57 UTC 2022)
2022-02-08 21:17:57 +00:00
Razgriz
414d66471e
Merge pull request #3637 from CHOMPStation2/upstream-merge-12175
...
[MIRROR] Bump axios from 0.21.1 to 0.21.2 in /tgui
2022-02-08 14:17:20 -07:00
Razgriz
26f1e73a17
Merge pull request #3633 from Verkister/swirlytime
...
Makes toilets slightly more fun
2022-02-08 14:14:55 -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
Casey
cfefb1098e
Hastily gives the ERT their suits back
2022-02-07 23:17:22 +00:00
CHOMPStation2
782c440aef
Allergen Reaction Tuning
2022-02-07 23:17:12 +00:00
Casey
b83034829f
Merge pull request #12173 from KillianKirilenko/kk-test
...
Allergen Reaction Tuning
2022-02-07 23:17:12 +00:00
CHOMPStation2
cb1e06a705
Bump axios from 0.21.1 to 0.21.2 in /tgui
2022-02-07 20:57:47 +00:00
Novacat
59283cfc3a
Merge pull request #12175 from VOREStation/dependabot/npm_and_yarn/tgui/axios-0.21.2
...
Bump axios from 0.21.1 to 0.21.2 in /tgui
2022-02-07 20:57:47 +00: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
bc382a60c4
Merge pull request #3629 from CHOMPStation2/upstream-merge-12168
...
[MIRROR] Further item bank restrictions
2022-02-06 23:48:32 -05:00
Nadyr
e34ca52a87
Merge branch 'master' into upstream-merge-12168
2022-02-06 22:08:28 -05:00
Nadyr
1c9386b2bd
Merge pull request #3628 from CHOMPStation2/upstream-merge-12165
...
[MIRROR] The final Item Bank patch?
2022-02-06 22:07:05 -05:00
Nadyr
524db7ba79
Merge pull request #3625 from CHOMPStation2/upstream-merge-12164
...
[MIRROR] talon miner
2022-02-06 21:58:06 -05:00
Nadyr
6e44bb7876
Merge branch 'master' into upstream-merge-12165
2022-02-06 21:53:14 -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
7f75efc328
powder that makes you say yes
2022-02-06 21:47:41 -05:00
Nadyr
4dded2ec62
powder that makes you say yes
2022-02-06 21:43:02 -05:00
Nadyr
84fc4e68c3
powder that makes you say yes
2022-02-06 21:41:20 -05:00
Nadyr
33403c6445
Merge branch 'master' into upstream-merge-12164
2022-02-06 21:38:32 -05:00
Nadyr
d074a0f756
Merge pull request #3624 from CHOMPStation2/upstream-merge-12161
...
[MIRROR] Allergy Rebuff
2022-02-06 21:32:49 -05:00
Casey
0ace36e925
Further item bank restrictions
2022-02-07 02:31:46 +00:00
Nadyr
dd90a7eaa6
Merge pull request #3621 from CHOMPStation2/upstream-merge-12158
...
[MIRROR] Item Bank fixy!
2022-02-06 21:31:20 -05:00
Nadyr
0a454b6c3d
Merge pull request #3619 from CHOMPStation2/upstream-merge-12149
...
[MIRROR] makes amour for lucky
2022-02-06 21:02:24 -05:00
Nadyr
5eff6c2f63
Merge branch 'master' into upstream-merge-12158
2022-02-06 20:56:50 -05:00
Nadyr
8818ecf87a
powder that makes you say yes
2022-02-06 20:43:03 -05:00
Nadyr
2a5704f056
Merge pull request #3618 from CHOMPStation2/upstream-merge-12152
...
[MIRROR] Adds extra advice to Flavor Text popup
2022-02-06 20:42:18 -05:00
Nadyr
853f1b86a4
Merge pull request #3617 from CHOMPStation2/upstream-merge-12155
...
[MIRROR] Item bank!
2022-02-06 20:41:49 -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
4b2b0c85bc
Merge pull request #3614 from CHOMPStation2/upstream-merge-12150
...
[MIRROR] mining vendor 1000 thaler reward
2022-02-06 20:35:33 -05:00
Nadyr
c4ec073076
Merge pull request #3613 from CHOMPStation2/upstream-merge-12145
...
[MIRROR] makes a single t3 brace actually support its drill
2022-02-06 20:35:12 -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
Nadyr
f62c4d69bc
Merge pull request #3612 from CHOMPStation2/upstream-merge-11763
...
[MIRROR] Talon Improvements, Take 2
2022-02-06 19:50:28 -05:00
Nadyr
010390191c
powder that makes you say yes
2022-02-06 19:49:36 -05:00
Nadyr
fb8a1a2368
Merge pull request #3610 from Cyrelius/master
...
Update southern_cross_defines.dm
2022-02-06 19:33:00 -05:00
Nadyr
f48824843e
Merge pull request #3609 from CHOMPStation2/upstream-merge-12148
...
[MIRROR] [station] tag for paperwork
2022-02-06 18:58:04 -05:00
Casey
e6f02c05a6
The final Item Bank patch?
2022-02-06 23:29:28 +00:00
CHOMPStation2
1313bb25a4
exosuit cargo expansion equipment
2022-02-06 23:23:09 +00: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
CHOMPStation2
c9eae9e977
Allergy Rebuff
2022-02-06 23:11:19 +00:00
