Commit Graph

924 Commits

Author SHA1 Message Date
BongaTheProto
d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
Aypa
a3a238db5a Merge branch 'SPLURT-Station:master' into master 2023-02-12 19:30:56 -03:00
WoolyAypa
f8b38d0c54 . 2023-02-12 18:57:52 -03:00
BongaTheProto
3475c24721 Merge pull request #751 from SPLURT-Station/tail-fixxie
fix for snek tail
2023-02-12 01:02:35 -05:00
BongaTheProto
13a46e9592 guh 2023-02-12 00:55:05 -05:00
BongaTheProto
9cd04e7db9 Merge pull request #750 from WoolyAypa/master
space princess digitigrade flag
2023-02-12 00:48:59 -05:00
BongaTheProto
929f5399aa followup 2023-02-11 21:34:18 -05:00
WoolyAypa
a92d7e374c digitigrade 2023-02-11 22:51:04 -03:00
BongaTheProto
413968c76d Merge pull request #746 from WoolyAypa/stuff
In a galaxy far far away...
2023-02-11 02:07:08 -05:00
WoolyAypa
ba91216291 polychromic 2023-02-10 14:56:14 -03:00
WoolyAypa
ba671fad6c to the clothesmate it goes 2023-02-10 00:07:38 -03:00
WoolyAypa
48cd331cd7 stuff 2023-02-09 23:57:41 -03:00
BongaTheProto
655efc51c0 Merge pull request #740 from Comicao1/beachball
Bounty beachball
2023-02-09 20:40:48 -05:00
BongaTheProto
b6fa37d08f Update preferences.dm 2023-02-08 19:03:01 -05:00
BongaTheProto
79e84f961a le chars tm
how do you even reach the saves limit brah
2023-02-07 18:31:55 -05:00
BongaTheProto
ef0b7ead34 snekkk
snek tail by mayhem™️
2023-02-07 18:31:55 -05:00
Comicao1
4722e7b54b Opsie 2023-02-07 18:45:23 -03:00
Comicao1
9feb3c31c8 Bounty beachball 2023-02-07 18:30:00 -03:00
BongaTheProto
f5b1fab9be Merge pull request #723 from The-Real-Goku/photography-update
Photography update
2023-02-07 15:57:53 -05:00
BongaTheProto
21566c5a1b Merge pull request #645 from LeDrascol/unrestricted-light-replacer
Add Bluespace Light Replacer to Science protolathe
2023-02-07 15:29:35 -05:00
zerothebigboy
58fa2127bc okay 2023-02-07 09:45:54 -05:00
BongaTheProto
e7f1a19d4a Merge pull request #728 from AshTheDerg/AshieDrinkProjectPt1
More Drinks Part 1
2023-02-03 21:40:03 -05:00
BongaTheProto
2eccd56e6b Merge branch 'master' into pr/660 2023-02-03 19:48:12 -05:00
BongaTheProto
3b04a3e938 Merge pull request #727 from LeDrascol/verb-subtle-indicator
Add variant Subtle verb with typing indicator
2023-02-03 19:42:54 -05:00
Darius
c816746196 Update verb name for subtle_indicator
Changes the subtle_verb indicator to use proper case.
2023-02-03 19:28:32 -05:00
Darius
e12ca4c0e5 Restore hexacrocin interaction with estrous
Restores reagent interaction between hexacrocin and the In Estrous quirk. User will be granted the quirk on overdose start.
2023-02-02 19:25:59 -05:00
Darius
157db709ef Remove obsolete heat quirks
Removes quirks In Heat and Estrus Detection, which were merged upstream into Sandstorm.
2023-02-02 15:52:31 -05:00
Darius
16b52833ef Allow Science access to BSLR
This does the following
- Adds Science access to the Bluespace Light Replacer
- Reverts general access to the Light Replacer
2023-02-02 00:24:14 -05:00
Darius
006202c2e2 Merge branch 'master' into unrestricted-light-replacer 2023-02-02 00:14:41 -05:00
AshTheDerg
f98127e419 More Drinks Part 1
Adds 10 new types of Milkshakes
2023-02-01 05:41:58 -05:00
Darius
70d9fef21d Add subtle with typing indicator
This commit adds a variant of the subtle verb that uses a typing indicator, and replaces the original key binding with it.
2023-02-01 00:29:03 -05:00
BongaTheProto
7ebdfba5c9 modularize
yep
2023-01-30 17:57:24 -05:00
BongaTheProto
e13ec21ba0 followup 2023-01-30 17:02:54 -05:00
BongaTheProto
96703f76bc Modularize 2023-01-29 12:37:39 -05:00
Moribun
ec97ed015d stuff added
*ported tail from my server of the nightstalker variety

*unfucked zombo's not being able to get blood back

*made vault suit digigrade compatible
2023-01-29 07:24:12 -06:00
BongaTheProto
8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
AshTheDerg
221283c313 Borg Shaker Fix 2023-01-27 15:12:54 -05:00
AshTheDerg
df98398060 Borg Shaker Fix 2023-01-27 14:00:50 -05:00
AshTheDerg
b3a4d968ba More Shaker Fix 2023-01-27 13:35:20 -05:00
AshTheDerg
6e67b60d6e Borg Shaker Fix
I fix it.
2023-01-27 13:23:25 -05:00
AshTheDerg
e7e8b422b4 Bork Shaker fix
I broked it.
2023-01-27 13:22:23 -05:00
AshTheDerg
4f4108d934 Merge branch 'SPLURT-Station:master' into patch-3 2023-01-27 13:17:09 -05:00
AshTheDerg
ce762c376c Fix broken beer shaker
I broke the beer shaker. This SHOULD fix it.
2023-01-27 04:37:59 -05:00
BongaTheProto
7207f6fb74 Merge pull request #718 from AshTheDerg/patch-3
Borg Beer Shaker drink add
2023-01-26 23:29:20 -05:00
BongaTheProto
e3d35f46aa Merge pull request #713 from Kush1Push1/splurt_pilot
Pilot and pilot jaw body markings
2023-01-26 16:45:35 -05:00
BongaTheProto
2aa678176e Merge pull request #600 from ShamanSliph/cloth-eater
New Quirk: Clothes Eater and Fixes Insects chewing clothes
2023-01-26 01:39:16 -05:00
AshTheDerg
e0f9978a11 Borg Beer Shaker additions 2023-01-26 01:10:01 -05:00
AshTheDerg
a2df6d6143 Borg Beer Shaker drink add
Adds some extra drinks to the Borg Beer Shaker
2023-01-26 00:59:34 -05:00
BongaTheProto
4bba867c36 Merge pull request #712 from Kush1Push1/splurt_beak
Corvid beak
2023-01-25 22:47:11 -05:00
BongaTheProto
4b502c8e17 Merge pull request #703 from LeDrascol/techweb-move-rack
Move Research Rack to Biological Technology
2023-01-25 18:16:43 -05:00