Commit Graph

31712 Commits

Author SHA1 Message Date
Razgriz
ffbb7fe0d8 Merge pull request #3739 from CHOMPStation2/upstream-merge-12307
[MIRROR] Smol morph fix
2022-03-01 00:47:10 -07:00
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
7137815653 Merge pull request #3729 from CHOMPStation2/upstream-merge-12297
[MIRROR] fixes hardsuit coolers, actually
2022-03-01 00:36:25 -07:00
Razgriz
90c4e3535d Merge pull request #3724 from CHOMPStation2/upstream-merge-12293
[MIRROR] 11743 fix
2022-03-01 00:33:12 -07:00
Razgriz
e623bc899d Merge pull request #3723 from CHOMPStation2/upstream-merge-12291
[MIRROR] 8330 fix
2022-03-01 00:30:34 -07:00
Razgriz
f90e935687 Merge pull request #3722 from CHOMPStation2/upstream-merge-12292
[MIRROR] 8316 fix
2022-03-01 00:29:44 -07:00
Razgriz
15f43a90e1 Fix the ChangeTurf improvements PR, 3725 2022-02-28 23:33:34 -07:00
Razgriz
d4e8d5c0d6 Merge pull request #3721 from CHOMPStation2/upstream-merge-11700
[MIRROR] [MIRROR] Minor bodytemp warning refactor.
2022-02-28 22:50:55 -07:00
Casey
2916cd9f91 Miscelanious map tweaks 2022-02-26 17:40:19 +00:00
Razgriz
eff6adc6db Cyber Horror fixes
Also changed laser sound effect for the corgi
2022-02-22 17:35:27 -07:00
Casey
ae308331ac Merge pull request #12307 from Very-Soft/unmuffledamorph
Smol morph fix
2022-02-22 22:21:44 +00:00
Razgriz
1e6c1ee983 comment 2022-02-22 15:10:46 -07:00
Razgriz
40f1ad70e0 Mechanical mobs maxbodytemp 900 2022-02-22 15:10:05 -07:00
Razgriz
66fa78463b Corrupt hounds immune to cold 2022-02-22 15:09:12 -07:00
Casey
a76ed3250c Merge pull request #12297 from Hatterhat/hardshit-coolers
fixes hardsuit coolers, actually
2022-02-20 12:38:19 +00:00
Nadyr
096f6936bd Merge pull request #3719 from CHOMPStation2/upstream-merge-12287
[MIRROR] Adds swept back rabbit ears and large antlers from Jackalope as independant markings
2022-02-19 20:52:00 -05: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
5680916f50 powder that makes you say yes 2022-02-19 20:50:48 -05:00
Nadyr
8f5bd593ba Merge branch 'master' into upstream-merge-12288 2022-02-19 20:48:23 -05:00
Nadyr
34c742b55e powder that makes you say yes 2022-02-19 20:39:18 -05:00
Casey
08eda43ecc Adds swept back rabbit ears and large antlers from Jackalope as independant markings 2022-02-19 20:37:19 -05: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
4f53ebd9c9 powder that makes you say yes 2022-02-19 20:31:40 -05:00
Nadyr
fa1fea2c56 Merge pull request #3715 from CHOMPStation2/upstream-merge-12285
[MIRROR] 7914 branch fix
2022-02-19 19:58:40 -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
Casey
c7b4b0d8b4 adds avida's clothes and alt bnnuy ears 2022-02-19 19:30:17 -05:00
Casey
f89834cd72 Merge pull request #12293 from Heroman3003/11743-fix
11743 fix
2022-02-20 00:07:37 +00:00
Nadyr
5baec6eb8a Merge pull request #3703 from CHOMPStation2/upstream-merge-12274
[MIRROR] Add's Brad's Air Jordans
2022-02-19 19:01:08 -05:00
Nadyr
eb5a81c783 Merge pull request #3702 from CHOMPStation2/upstream-merge-12272
[MIRROR] Morph tf color fomx
2022-02-19 19:00:49 -05:00
Nadyr
efa941a8be powder that makes you say yes 2022-02-19 18:55:20 -05:00
Nadyr
f22e8b066c powder that makes you say yes 2022-02-19 18:51:17 -05:00
Nadyr
37ed5f34bd Merge pull request #3697 from CHOMPStation2/upstream-merge-12266
[MIRROR] more kitsune tails + slight tail list tweak
2022-02-19 18:47:46 -05:00
Nadyr
008d247b7b powder that makes you say yes 2022-02-19 18:47:33 -05:00
Nadyr
55b5e99d17 Merge branch 'master' into upstream-merge-12272 2022-02-19 18:42:46 -05:00
Nadyr
24cf8db198 powder that makes you say yes 2022-02-19 18:42:18 -05:00
Nadyr
b513f79c69 Merge pull request #3698 from CHOMPStation2/upstream-merge-12268
[MIRROR] ar-b glasses are now actually ar
2022-02-19 18:18:59 -05:00
Nadyr
e79893a13a powder that makes you say yes 2022-02-19 18:17:50 -05:00
Nadyr
29f4968fc4 Merge pull request #3696 from CHOMPStation2/upstream-merge-12263
[MIRROR] Doom Barrels
2022-02-19 18:16:11 -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
Nadyr
96769bf048 powder that makes you say yes 2022-02-19 17:56:28 -05:00
Nadyr
9a39692f1b Merge pull request #3695 from CHOMPStation2/upstream-merge-12265
[MIRROR] AR Glasses Shading Tweak
2022-02-19 17:55:02 -05:00
Nadyr
ab14efcf41 powder that makes you say yes 2022-02-19 17:54:22 -05:00
Nadyr
8654f5004c Merge pull request #3646 from CHOMPStation2/upstream-merge-12185
[MIRROR] Don't persist spitwads and gum
2022-02-19 17:53:24 -05:00
Casey
58a5611395 Merge pull request #12291 from Heroman3003/8330-fix
8330 fix
2022-02-19 22:33:38 +00:00
Casey
02acd7cba0 8316 fix 2022-02-19 22:33:29 +00:00
Casey
c94588fd28 Merge pull request #11700 from VOREStation/upstream-merge-8335
[MIRROR] Minor bodytemp warning refactor.
2022-02-19 22:12:40 +00: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
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00