Razgriz
43bfaed740
Merge pull request #3720 from CHOMPStation2/upstream-merge-12288
...
[MIRROR] [ready] pastelprincedan plushie fluff item
2022-03-01 00:39:21 -07:00
Razgriz
e90f53c2cb
Merge pull request #3727 from CHOMPStation2/upstream-merge-12295
...
[MIRROR] Item Bank - Do not store things crafted from material stacks
2022-03-01 00:35:04 -07:00
Nadyr
59090266bd
Merge pull request #3717 from CHOMPStation2/upstream-merge-12286
...
[MIRROR] Merge Fixes for 8222
2022-02-19 20:51:16 -05:00
Nadyr
8f5bd593ba
Merge branch 'master' into upstream-merge-12288
2022-02-19 20:48:23 -05:00
Casey
780499fff6
Merge pull request #12295 from Very-Soft/stackpersist
...
Item Bank - Do not store things crafted from material stacks
2022-02-20 01:36:58 +00:00
Nadyr
23f9e5828b
Merge pull request #3701 from CHOMPStation2/upstream-merge-12247
...
[MIRROR] Fixes sofa paths
2022-02-19 20:34:07 -05:00
Nadyr
3fe87a33ed
Merge pull request #3711 from CHOMPStation2/upstream-merge-12253
...
[MIRROR] Donk Co. Toys
2022-02-19 19:55:19 -05:00
Nadyr
f36f32e7d8
forgot the crossbow changed too
2022-02-19 19:25:19 -05:00
Nadyr
cc600eeec0
change old crossbow ammo path
2022-02-19 19:19:26 -05:00
Nadyr
6c385e6dd4
Merge pull request #3709 from CHOMPStation2/upstream-merge-12262
...
[MIRROR] primative-shields
2022-02-19 18:53:34 -05:00
Nadyr
97cf4ce634
Merge pull request #3681 from CHOMPStation2/upstream-merge-12233
...
[MIRROR] Heavy-duty Engineer's Gloves
2022-02-19 18:15:45 -05:00
Casey
dc837b05b4
[ready] pastelprincedan plushie fluff item
2022-02-19 22:06:21 +00:00
Casey
592777ba9b
Merge Fixes for 8222
2022-02-19 22:04:54 +00:00
Casey
3d6510f3ea
Donk Co. Toys
2022-02-19 04:27:50 +00:00
Casey
7ad39bffcb
Merge pull request #12262 from TheDavestDave/primative-shield-2
...
primative-shields
2022-02-19 04:02:45 +00:00
Casey
7a786393f4
Merge pull request #12278 from Very-Soft/capcrysfix
...
Fix a runtime with capture crystals
2022-02-18 23:46:08 +00:00
Casey
8bfa8b09ab
Fixes sofa paths
2022-02-18 19:05:41 +00:00
Razgriz
b0282d8d1b
Merge pull request #3693 from CHOMPStation2/upstream-merge-12256
...
[MIRROR] Sizegun Revamp 2022
2022-02-17 17:38:01 -07:00
Razgriz
9966377da6
Merge pull request #3684 from CHOMPStation2/upstream-merge-12242
...
[MIRROR] Now's your chance to be a [BIG SHOT]
2022-02-17 17:34:00 -07:00
Casey
9b6517106b
Merge pull request #12256 from GhostActual/sizegun-revamp-2022
...
Sizegun Revamp 2022
2022-02-17 20:32:45 +00:00
Razgriz
02464b1b20
Merge pull request #3676 from CHOMPStation2/upstream-merge-12222
...
[MIRROR] Uncapitalize curious crystal
2022-02-16 14:27:36 -07:00
Razgriz
41832fdc16
Merge pull request #3670 from CHOMPStation2/upstream-merge-12210
...
[MIRROR] [MIRROR] Cybernetic Augments and Sick Tats
2022-02-16 14:26:02 -07:00
Casey
c3a0eaaf5b
Merge pull request #12242 from GhostActual/bigshot_glasses
...
Now's your chance to be a [BIG SHOT]
2022-02-16 07:21:13 +00:00
Casey
e723ed2118
Heavy-duty Engineer's Gloves
2022-02-14 21:32:19 +00:00
BlackMajor
0c942396f8
Update communicator.dm
2022-02-14 15:23:12 +13:00
Casey
c99308895a
Merge pull request #12222 from Very-Soft/tinyedit
...
Uncapitalize curious crystal
2022-02-14 00:00:46 +00:00
Casey
d4c693378d
Merge pull request #12210 from VOREStation/upstream-merge-8200
...
[MIRROR] Cybernetic Augments and Sick Tats
2022-02-13 21:48:53 +00:00
Razgriz
ea5b01ad69
Merge pull request #3653 from CHOMPStation2/upstream-merge-12191
...
[MIRROR] strapless bag
2022-02-13 01:31:20 -07:00
Razgriz
4c7db84cbf
Merge pull request #3657 from CHOMPStation2/upstream-merge-12194
...
[MIRROR] Fixes pouches
2022-02-13 01:21:49 -07:00
Razgriz
ad2e88fdf6
Merge branch 'master' into upstream-merge-12191
2022-02-13 01:18:29 -07:00
Razgriz
3a23ec5ba2
Merge pull request #3650 from CHOMPStation2/upstream-merge-12188
...
[MIRROR] Size Standardization Bracelet
2022-02-13 01:16:22 -07:00
Casey
36323b3b12
Merge pull request #12194 from ktccd0/ktccd-dev-Pouches-Fix
...
Fixes pouches
2022-02-11 22:20:28 +00:00
Casey
0319e46850
strapless bag
2022-02-11 21:36:25 +00: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
