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
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
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
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
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
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
Casey
a503fa1c7f
Merge pull request #12188 from Very-Soft/yeah!
...
Size Standardization Bracelet
2022-02-10 00:57:10 +00: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
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
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
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
Novacat
9ec8187e24
Merge pull request #12081 from Heroman3003/pockygum
...
Makes pocky not leave behind trash gum
2022-01-22 14:24:26 +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
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
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
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
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
Nadyr
bb0392740f
powder that makes you say yes
2021-12-12 04:23:10 -05:00
Nadyr
89168e2c7d
powder that makes you say yes
2021-12-12 04:22:41 -05:00
