Commit Graph

31762 Commits

Author SHA1 Message Date
Razgriz
1d4bf70172 powder that makes you say yes 2022-03-04 16:22:21 -07:00
Casey
d77ef1dc60 Sizegun Changes 2022-03-04 00:39:53 +00:00
Casey
5603fb7bd4 Merge pull request #12358 from BonniePandora/PDA-clamshell+more
New PDA type, new sprites for other types & overlays!
2022-03-02 18:14:44 +00:00
Razgriz
ca4aae88e5 Merge pull request #3778 from CHOMPStation2/upstream-merge-12356
[MIRROR] Change painting persist decay
2022-03-01 23:44:49 -07:00
Casey
68c0ed10a7 Merge pull request #12356 from Very-Soft/persistchange
Change painting persist decay
2022-03-02 06:08:02 +00:00
Casey
b978c9a34f Merge pull request #12357 from GhostActual/3D-glasses-loadout
Adds 3D glasses to Loadout
2022-03-02 06:07:56 +00:00
Razgriz
893efb6f10 Morph spawn event
Enabled
2022-03-01 19:50:30 -07:00
Razgriz
a27432157c Bring back Chompstation's most based disclaimer
This time with a chomp comment
2022-03-01 19:06:56 -07:00
Razgriz
559373be0b Merge pull request #3773 from CHOMPStation2/ThrowModeQoL-oldPR
Throwing QoL
2022-03-01 01:51:28 -07:00
Razgriz
3b64cca8ab Merge branch 'master' into upstream-merge-12354 2022-03-01 01:37:45 -07:00
Razgriz
61ad397978 Merge pull request #3770 from CHOMPStation2/upstream-merge-12350
[MIRROR] More Allergen Tweaks
2022-03-01 01:36:55 -07:00
Razgriz
2531ff73a0 Merge pull request #3769 from CHOMPStation2/upstream-merge-12351
[MIRROR] It is time to gyoh!
2022-03-01 01:36:50 -07:00
Razgriz
4b8dab8e91 Merge pull request #3767 from CHOMPStation2/upstream-merge-12347
[MIRROR] adds Zone Braid
2022-03-01 01:36:43 -07:00
Razgriz
90f700cb48 Merge pull request #3764 from CHOMPStation2/upstream-merge-12336
[MIRROR] [MIRROR] Adds NT logo to NT plate carrier tags
2022-03-01 01:36:08 -07:00
Razgriz
df7fb27d81 Merge pull request #3763 from CHOMPStation2/upstream-merge-12344
[MIRROR] New ringtones
2022-03-01 01:36:00 -07:00
Razgriz
9766545803 Merge pull request #3757 from CHOMPStation2/upstream-merge-12340
[MIRROR] Borg Module Shuffle and Missing Verbs
2022-03-01 01:35:35 -07:00
Razgriz
263b6468a6 Merge pull request #3753 from CHOMPStation2/upstream-merge-12330
[MIRROR] THERE WILL BE BLOOD. SHED.
2022-03-01 01:35:30 -07:00
Razgriz
ab494dfe5c Throwing QoL
Revival of #3047 and #3115
2022-03-01 01:34:53 -07:00
Razgriz
7cdaea188a Merge pull request #3749 from CHOMPStation2/upstream-merge-12322
[MIRROR] Carpet Craftin'
2022-03-01 01:20:06 -07:00
Razgriz
40ab4d17f2 Merge pull request #3747 from CHOMPStation2/upstream-merge-12319
[MIRROR] Trader!
2022-03-01 01:20:01 -07:00
Razgriz
9cdd29fbb2 Merge pull request #3745 from CHOMPStation2/upstream-merge-12316
[MIRROR] Actually give staff the play z sound verb
2022-03-01 01:19:47 -07:00
Razgriz
7f9f5c4846 powder that makes you say yes 2022-03-01 01:18:06 -07:00
Razgriz
5d19f01fc2 powder that makes you say yes 2022-03-01 01:16:44 -07:00
Razgriz
6ee648d53e powder that makes you say yes 2022-03-01 01:14:52 -07:00
Razgriz
da821152f0 powder that makes you say yes 2022-03-01 01:13:10 -07:00
Razgriz
5611f22f73 Merge pull request #3759 from CHOMPStation2/upstream-merge-12345
[MIRROR] Adds hats to fishing vendors
2022-03-01 01:08:30 -07:00
Razgriz
6079a092ad powder that makes you say yes 2022-03-01 01:05:20 -07:00
Razgriz
4fe8e63024 Merge pull request #3756 from CHOMPStation2/upstream-merge-12342
[MIRROR] Adjust morph transform text
2022-03-01 01:04:06 -07:00
Razgriz
8261e6da5a Merge pull request #3754 from CHOMPStation2/upstream-merge-12327
[MIRROR] Trader tweak
2022-03-01 01:03:27 -07:00
Razgriz
4053e46562 Merge pull request #3751 from CHOMPStation2/upstream-merge-12328
[MIRROR] Fixes sect bugs not updating vore glow
2022-03-01 00:59:33 -07:00
Razgriz
388021e417 powder that makes you say yes 2022-03-01 00:57:51 -07:00
Razgriz
c57ef19032 Merge branch 'master' into upstream-merge-12319 2022-03-01 00:53:31 -07:00
Razgriz
bef429e9f4 Merge pull request #3740 from CHOMPStation2/upstream-merge-12309
[MIRROR] Play Z sound
2022-03-01 00:47:22 -07:00
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
af45961ea4 Adjust gyoh 2022-03-01 04:08:12 +00:00
Casey
0941220ad7 More Allergen Tweaks 2022-03-01 02:18:39 +00:00
Casey
d6f5407ce0 It is time to gyoh! 2022-03-01 02:18:34 +00:00
Casey
99e8537113 Merge pull request #12347 from PastelPrinceDan/zonehair
adds Zone Braid
2022-02-27 20:10:35 +00:00
Casey
9feb6a079c Merge pull request #12336 from VOREStation/upstream-merge-8403
[MIRROR] Adds NT logo to NT plate carrier tags
2022-02-27 20:07:15 +00:00
Casey
a85f8c2f55 Merge pull request #12344 from BonniePandora/PDA-ringtones
New ringtones
2022-02-27 20:05:06 +00:00
Casey
92701d02cb Merge pull request #12345 from Screemonster/iamaloneonthisforsakenearth
Adds hats to fishing vendors
2022-02-27 19:24:10 +00:00
Casey
08c5023f59 Borg Module Shuffle and Missing Verbs 2022-02-27 05:26:09 +00:00
Casey
50c47e950a Merge pull request #12342 from Very-Soft/morphy
Adjust morph transform text
2022-02-27 05:26:04 +00:00