cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,638 Commits 10 Branches 0 Tags
edb59bd4a34a68636e0bc7fdb1507ba4f210bf9c
Commit Graph

1696 Commits

Author SHA1 Message Date
Kassc
edb59bd4a3 Merge pull request #5812 from TheGreatKitsune/item-tf-spawn 
Item TF spawnpoints
 2023-03-03 21:18:08 -05:00
Nadyr
13e4159fa6 Merge branch 'master' into upstream-merge-14570 2023-02-27 18:43:39 -05:00
Nadyr
516ec1ee73 powder that makes you say yes 2023-02-27 02:19:50 -05:00
TheGreatKitsune
1d36a4215d Item TF spawnpoints 2023-02-26 15:43:47 -06: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
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +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
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
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
Razgriz
26da7eca95 Merge pull request #5748 from CHOMPStation2/upstream-merge-14493 
[MIRROR] Voxxy clothing
 2023-02-20 16:32:53 -07:00
Razgriz
c0d2768edb Merge pull request #5758 from CHOMPStation2/upstream-merge-14505 
[MIRROR] Even more sprites including decent hoodies
 2023-02-20 16:32:45 -07:00
Heroman3003
be56ab7289 Even more sprites including decent hoodies 2023-02-18 19:57:09 +00:00
Heroman3003
7e8b8bf3f2 Merge pull request #14506 from Seris02/nofreenifs 
no free nifs from switching species from protean
 2023-02-18 19:10:45 +00:00
Heroman3003
223af2747b Voxxy clothing 2023-02-17 18:51:12 +00:00
Rykka Stormheart
c4924ec8f9 Adds Alarm Effects, Makes Air alarm have decompress alarm 2023-02-13 01:06:29 -08:00
Razgriz
cd9f69570b Merge pull request #5702 from CHOMPStation2/upstream-merge-14472 
[MIRROR] adds trait preferences and removes a bug
 2023-02-12 19:12:11 -07:00
Razgriz
31cfabd3c6 Merge pull request #5700 from CHOMPStation2/upstream-merge-14456 
[MIRROR] Implements periodic tips for (new) players!
 2023-02-12 19:04:32 -07:00
Razgriz
a5037f3180 Revert "[MIRROR] Runtime fixes" 2023-02-12 19:03:56 -07:00
Razgriz
cd05f4c7e4 Merge pull request #5704 from CHOMPStation2/upstream-merge-14476 
[MIRROR] Runtime fixes
 2023-02-12 19:01:40 -07:00
Razgriz
ec57252f19 Merge pull request #5703 from CHOMPStation2/upstream-merge-14477 
[MIRROR] fix default proteans being technically organic shift start
 2023-02-12 19:01:04 -07:00
Razgriz
6b79bc97a7 Merge pull request #5697 from CHOMPStation2/upstream-merge-14470 
[MIRROR] Cloaks, undies, the Antediluvian, and some other bits
 2023-02-12 18:59:42 -07:00
Razgriz
9229e66b90 powder that makes you say yes 2023-02-12 18:56:11 -07:00
Razgriz
6d51b51abb Merge pull request #5695 from Sharkmare/patch-1 
Reroute Teshwraps to just use Footwraps
 2023-02-12 18:22:31 -07:00
Razgriz
4a52255262 Merge pull request #5689 from Rykka-Stormheart/shep-dev-temp-message-custom-fix 
Fixes Custom Cold messages being uneditable/editing the wrong list
 2023-02-12 18:16:05 -07:00
Razgriz
0b1059963b comments that make you say yes 2023-02-12 17:59:01 -07:00
Razgriz
71cc3901a1 Merge pull request #5684 from Echopsychotic/Clothing 
witch hat and cyborg mask added
 2023-02-12 17:55:42 -07:00
Casey
2891dc3ea7 Merge pull request #14476 from Heroman3003/runtime-17 
Runtime fixes
 2023-02-12 18:21:37 +00:00
Casey
c34feccac3 Merge pull request #14477 from Seris02/proteandefaultfix 
fix default proteans being technically organic shift start
 2023-02-12 18:21:32 +00:00
Casey
ffd8251f24 adds trait preferences and removes a bug 2023-02-12 18:20:26 +00:00
Casey
f841a10f4c Implements periodic tips for (new) players! 2023-02-12 18:19:13 +00:00
Heroman3003
358e8e9fa2 Cloaks, undies, the Antediluvian, and some other bits 2023-02-11 19:10:39 +00:00
Sharkmare
34dfd9b6f5 Reroute Teshwraps to just use Footwraps 
This mainly only matters for shapeshifters who thought tesh have to use this.

Yes, this is a self-callout.
 2023-02-11 06:37:28 +01:00
Fire Hazard
f0b0736bbd missing text 2023-02-09 07:42:18 -06:00
Rykka Stormheart
cc135c3d33 Fixes Custom Cold messages being uneditable/editing the wrong list 
As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly.

This corrects that.
 2023-02-08 08:01:31 -08:00
Heroman3003
c7827b37fb Merge pull request #14446 from Hatterhat/outfit-pass2 
skyrat outfit port continuation (adds to loadout)
 2023-02-08 03:13:42 +00:00
Fire Hazard
866a6692c5 mask and hat 
Adds cyborg mask and witch hat to loadout
 2023-02-07 16:59:58 -06:00
Nadyr
ccc3101516 powder that makes you say yes 2023-02-07 16:45:46 -05:00
Casey
ac099a732b proper sanitization of cold and heat messages 2023-02-07 19:19:18 +00:00
Nadyr
7755d3a593 Merge pull request #5678 from Rykka-Stormheart/shep-dev-discomfort-earlyport 
Earlyports #14459 from VORE, properly sanitizes heat/cold messages
 2023-02-07 13:43:58 -05:00
Nadyr
f71dfd8be7 Merge pull request #5665 from CHOMPStation2/upstream-merge-14443 
[MIRROR] Fixes "Colored Feminine Jumpsuit"
 2023-02-07 13:39:48 -05:00
Nadyr
97695a5aea Merge pull request #5645 from CHOMPStation2/upstream-merge-14416 
[MIRROR] Adds Lanterns to Loadout Selection
 2023-02-07 13:24:31 -05:00
Rykka Stormheart
e25aeb10d1 Indent oopsies in github copy 2023-02-07 09:27:21 -08:00
Rykka Stormheart
f8fe0768b0 Earlyports #14459 from VORE, properly sanitizes heat/cold messages 
Credit goes to Seris, not me, just earlyporting.
https://github.com/VOREStation/VOREStation/pull/14459
 2023-02-07 09:19:15 -08:00
Heroman3003
9e0a2711b3 Merge pull request #14455 from Seris02/nanoformfixwoops 
fixes nanoform limbs specifically from changing their child limbs
 2023-02-06 21:13:31 +00:00
Heroman3003
df19775b17 Merge pull request #14443 from Cyantime/patch-2 
Fixes "Colored Feminine Jumpsuit"
 2023-02-05 03:57:42 +00:00
Casey
4dc1ab7659 Merge pull request #14416 from liache/patch-2 
Adds Lanterns to Loadout Selection
 2023-02-04 05:36:40 +00:00
Nadyr
0e4960fc88 Merge pull request #5619 from CHOMPStation2/upstream-merge-14384 
[MIRROR] Adds ability to customize discomfort
 2023-02-02 20:45:58 -05:00
Nadyr
6945894ad7 Merge pull request #5633 from CHOMPStation2/upstream-merge-14386 
[MIRROR] sanitizes selection of custom bases in prefs
 2023-02-02 20:38:26 -05:00