cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,635 Commits 7 Branches 0 Tags
11e40e16d8d0d381f026ebcd71cd781caea7d367
Commit Graph

34426 Commits

Author SHA1 Message Date
Cyrelius
11e40e16d8 Merge branch 'CHOMPStation2:master' into Organs 2023-03-02 22:45:46 -08:00
Cyrelius
1aa26e0d2d Update laser_vr.dm 
Revert changes that shouldn't be in this branch
 2023-03-02 22:45:24 -08:00
Cyrelius
a7cee8e0fa Makes Promethean limbs less easy to splatter 
We buffed bone breaks so they don't break as easily, and this is Promethean's version of it, but it got forgotten about.
 2023-03-02 22:42:22 -08:00
Sharkmare
5e383a9ada Should fix #5759 2023-02-28 08:53:44 +01:00
BlackMajor
89f9657ac7 Merge pull request #5822 from Darlantanis/DemonGibsNerf 
Removes gibspawning from rift walkers
 2023-02-28 20:35:05 +13:00
Nadyr
f51941336d Removes gibspawning from AI demon, makes new gibspam type 2023-02-28 01:57:21 -05:00
Seris02
e41a824496 better observe messages 2023-02-28 14:03:40 +08:00
Razgriz
84ab7c421d Merge pull request #4176 from BlackMajor/protean-rework 
Protean rework part 2 (WIP)
 2023-02-27 19:09:14 -07:00
Nadyr
13e4159fa6 Merge branch 'master' into upstream-merge-14570 2023-02-27 18:43:39 -05:00
Nadyr
50fe69148e Merge pull request #5808 from CHOMPStation2/upstream-merge-14564 
[MIRROR] Allows speech bubbles to be selected in char setup and saved
 2023-02-27 18:41:00 -05:00
Razgriz
55585cca29 Merge pull request #5817 from CHOMPStation2/upstream-merge-14577 
[MIRROR] fixes a small typo on the slime fertility agent
 2023-02-27 12:20:09 -07:00
Casey
beb3423544 Merge pull request #14575 from Screemonster/mineminemine 
Makes mining drones have a smarter IFF
 2023-02-27 18:58:23 +00:00
Casey
582aaee6d9 Merge pull request #14577 from PastelPrinceDan/extract-fix 
fixes a small typo on the slime fertility agent
 2023-02-27 18:58:19 +00:00
Nadyr
516ec1ee73 powder that makes you say yes 2023-02-27 02:19:50 -05:00
Nadyr
7abf6b1ac8 Merge pull request #5800 from CHOMPStation2/upstream-merge-14556 
[MIRROR] [MIRROR] Lava Damage Adjustment
 2023-02-27 02:14:50 -05:00
Nadyr
180ca117dc Merge pull request #5799 from CHOMPStation2/upstream-merge-14565 
[MIRROR] Fixes hull-made items putting hull materials in my autolathe
 2023-02-27 02:11:49 -05:00
Nadyr
50e06b5bdc Merge pull request #5780 from CHOMPStation2/upstream-merge-14535 
[MIRROR] makes Process belly button call death() on target
 2023-02-27 02:06:55 -05:00
Casey
3c0afc385c Enables Testing Character Voices in Setup 2023-02-26 18:54:32 +00:00
Casey
3c878714b8 Allows speech bubbles to be selected in char setup and saved 2023-02-26 18:10:11 +00:00
Rykka Stormheart
e26e3e821d Enables Testing Character Voices in Setup 
As title;
This function was WIP, @blackmajor didn't have time to finish it.
I went ahead and finished this up, and realized it was worth PR'ing separately for speedmerge, because this is MASSIVELY convenient.

TL;DR:
You can hit "Test Character Voice" in setup, to play a preview of what your voice will sound like with the selected type and frequency.

See demonstration here: https://streamable.com/m6u9vc
 2023-02-26 03:52:24 -08:00
BlackMajor
59766b720c Merge pull request #5790 from CHOMPStation2/upstream-merge-14536 
[MIRROR] Makes speech bubbles manually selectable, adds a whole bunch of new ones
 2023-02-27 00:01:40 +13:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Heroman3003
910a4eb7e8 Merge pull request #14556 from VOREStation/upstream-merge-8983 
[MIRROR] Lava Damage Adjustment
 2023-02-26 09:46:15 +00:00
Heroman3003
7717c49c87 Merge pull request #14565 from Heroman3003/atuolaathe 
Fixes hull-made items putting hull materials in my autolathe
 2023-02-26 09:46:09 +00:00
Razgriz
e966a01446 Merge pull request #5789 from CHOMPStation2/upstream-merge-14393 
[MIRROR] Makes cooldown between pain messages a pre-set global preference
 2023-02-26 01:06:29 -07:00
Razgriz
681328604a Merge pull request #5791 from CHOMPStation2/upstream-merge-14561 
[MIRROR] adds the bladerunner coat to loadout
 2023-02-26 01:05:58 -07:00
Razgriz
d9327eb1f4 Merge pull request #5792 from Raeschen/master 
Remove ghost join/leave notifications
 2023-02-26 01:01:27 -07:00
Razgriz
77001e49cf Merge pull request #5787 from CHOMPStation2/upstream-merge-14555 
[MIRROR] [MIRROR] Menthol doesn't kill you at 7 units
 2023-02-26 01:00:57 -07:00
Razgriz
b1f4a090a8 Merge pull request #5783 from CHOMPStation2/upstream-merge-14544 
[MIRROR] Fixes 2 runtimes
 2023-02-26 00:59:19 -07:00
Razgriz
8cfbecfa58 Merge pull request #5782 from CHOMPStation2/upstream-merge-14543 
[MIRROR] Allows ore processors to start collecting ore pieces again
 2023-02-26 00:59:01 -07:00
Razgriz
6c60fc108f powder that makes you say yes 2023-02-26 00:57:19 -07:00
Razgriz
b8e285e002 Merge pull request #5777 from CHOMPStation2/upstream-merge-14537 
[MIRROR] dotted orange mushroom cap sprite in ear slot, non-colorable
 2023-02-26 00:55:23 -07:00
Razgriz
024f962f2f Merge pull request #5770 from CHOMPStation2/upstream-merge-14530 
[MIRROR] prevents persistent dirt (and other filth) from spawning in spess and walls
 2023-02-26 00:53:29 -07:00
Razgriz
08e5af4a80 Merge pull request #5768 from CHOMPStation2/upstream-merge-14527 
[MIRROR] Fixes runtime from mobs without minds
 2023-02-26 00:52:45 -07:00
Razgriz
108bbb1e52 Merge pull request #5771 from Seris02/extrastuff 
synthnaga tail, four ears ears, updated digi guilmon markings
 2023-02-25 22:25:28 -07:00
Raeschen
52a70fe414 Remove ghost join/leave notifications 2023-02-26 01:18:42 +01:00
Casey
bb4b1835e7 Merge pull request #14561 from peeesh/HES-LITERALLY-ME 
adds the bladerunner coat to loadout
 2023-02-25 19:32:38 +00:00
Casey
41c20ca400 Merge pull request #14536 from Heroman3003/protean 
Makes speech bubbles manually selectable, adds a whole bunch of new ones
 2023-02-25 19:29:25 +00:00
Heroman3003
ebe81811db Merge pull request #14393 from Runa-Dacino/pain-frequency 
Makes cooldown between pain messages a pre-set global preference
 2023-02-25 18:33:49 +00:00
Heroman3003
dc64d2464b Merge pull request #14555 from VOREStation/upstream-merge-8979 
[MIRROR] Menthol doesn't kill you at 7 units
 2023-02-25 08:21:21 +00:00
Heroman3003
956fe2e70d Merge pull request #14550 from Seris02/resizepickupfix 
fix for mob holders disappearing on pickup from inventory
 2023-02-25 08:16:06 +00:00
Heroman3003
0f1ad47460 Merge pull request #14544 from Heroman3003/runtime-fixes-1 
Fixes 2 runtimes
 2023-02-25 03:03:04 +00:00
Heroman3003
8fa41aa7b6 Merge pull request #14543 from Heroman3003/ore-pieces 
Allows ore processors to start collecting ore pieces again
 2023-02-25 03:02:59 +00:00
Heroman3003
43b17f0352 makes Process belly button call death() on target 2023-02-25 03:01:48 +00:00
Heroman3003
ffff1468c1 Merge pull request #14537 from LiquidFirefly/badger-x12 
dotted orange mushroom cap sprite in ear slot, non-colorable
 2023-02-25 03:00:28 +00:00
BlackMajor
7d72ebeb73 Don't spam admins please 2023-02-25 14:54:19 +13:00
BlackMajor
ef046afc8d Don't spam admin logs please 2023-02-25 14:52:23 +13:00
Razgriz
5869a7dd23 Oops I got the %chance backwards 2023-02-24 13:17:54 -07:00
Razgriz
781b7b75d4 debug logging 2023-02-24 13:08:02 -07:00
Razgriz
0ba4e424cd debug logging 2023-02-24 13:07:21 -07:00