cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 17:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,236 Commits 9 Branches 0 Tags
6bebf455f230c577d92d26fd9899bc5e69b6852c
Commit Graph

14571 Commits

Author SHA1 Message Date
Verkister
429f20e59d Un-monkeys the default gib proc 2023-04-06 14:05:46 +03:00
Nadyr
d2c8865198 Merge pull request #6024 from CHOMPStation2/upstream-merge-14751 
[MIRROR] Replaces ghetto xenomorph egg, cleans up egg process
 2023-04-02 20:05:47 -04:00
Nadyr
cb7e20423d Merge pull request #6022 from CHOMPStation2/upstream-merge-14747 
[MIRROR] More space creature events
 2023-04-02 20:05:04 -04:00
Nadyr
923c376200 Merge pull request #6021 from CHOMPStation2/upstream-merge-14750 
[MIRROR] Stop 'cancel' button from wiping flavor text
 2023-04-02 19:35:23 -04:00
Nadyr
9b905cea50 Merge pull request #6020 from CHOMPStation2/upstream-merge-14748 
[MIRROR] Adds more alt naga tail variations
 2023-04-02 19:34:12 -04:00
Heroman3003
264d908ce7 Merge pull request #14751 from MisterGrimm/Xenoeggfix 
Replaces ghetto xenomorph egg, cleans up egg process
 2023-04-02 20:24:49 +00:00
Heroman3003
a4072d405e More space creature events 2023-04-02 20:23:37 +00:00
Heroman3003
bfd45cf2d0 Merge pull request #14750 from Cyantime/ftextreset 
Stop 'cancel' button from wiping flavor text
 2023-04-02 20:23:32 +00:00
Heroman3003
bf19cb4424 Merge pull request #14748 from Heroman3003/altnagastyles 
Adds more alt naga tail variations
 2023-04-02 20:23:27 +00:00
Heroman3003
7ea6b2ce9e Makes the tether trash rat into real boy/girl/creature 2023-04-02 20:23:20 +00:00
Razgriz
ee54791e47 Merge pull request #6001 from Rykka-Stormheart/shep-dev-spec-fix-2 
Species Sounds Hotfix 2
 2023-04-01 18:59:39 -07:00
TheGreatKitsune
ec3cd00518 Merge master into shadekin-dark-tunneling 2023-04-01 09:24:41 -05:00
Nadyr
7a7233a702 Merge pull request #6007 from CHOMPStation2/upstream-merge-14740 
[MIRROR] Adds Firm Body trait and throwforce resistance
 2023-03-31 19:53:35 -04:00
Nadyr
98ac7a2a1e Merge pull request #5994 from CHOMPStation2/upstream-merge-14730 
[MIRROR] Adds 'drone' versions of mercenary mobs.
 2023-03-31 19:39:31 -04:00
Nadyr
953b86e2a4 powder that makes you say yes 2023-03-31 19:34:16 -04:00
Nadyr
a76442fc82 Merge pull request #6005 from CHOMPStation2/upstream-merge-14745 
[MIRROR] Updates wasp taur sprite a bit, adds ant and fat naga taurs
 2023-03-31 19:32:16 -04:00
Nadyr
3a28b357b8 Merge pull request #5996 from CHOMPStation2/upstream-merge-14723 
[MIRROR] Ethanol Processors
 2023-03-31 19:07:45 -04:00
Nadyr
99a1a1b900 powder that makes you say yes 2023-03-31 19:05:40 -04:00
Nadyr
5fb3cece3c Merge pull request #5993 from CHOMPStation2/upstream-merge-14731 
[MIRROR] Adds a whitescale-based version of Demon Wings
 2023-03-31 19:04:18 -04:00
Nadyr
99fa9e7eb9 Merge pull request #5991 from Seris02/subtlenosound 
subtle sounds no longer play unless adjacent
 2023-03-31 19:03:06 -04:00
Nadyr
108e55b6bf Merge pull request #5990 from tacoguy7765093/team-fortress-bot-moment 
Reverts merc sniper buff
 2023-03-31 19:02:44 -04:00
Nadyr
a6d68383c1 Merge pull request #5987 from Verkister/trashcatcher 
Adds trash eater throw vore mode
 2023-03-31 18:57:49 -04:00
Nadyr
b59ed11c4d Merge pull request #5986 from CHOMPStation2/upstream-merge-14728 
[MIRROR] fixes unique holograms, their outdated icons, and hologram offsets
 2023-03-31 18:56:43 -04:00
Nadyr
5a41bc832a Merge pull request #5985 from CHOMPStation2/upstream-merge-14663 
[MIRROR] Fixes item loss when dying as a prommie blob
 2023-03-31 18:54:47 -04:00
Nadyr
cf0e6b3be7 Merge pull request #5892 from Sharkmare/Voice-stuff 
Refactored talk_sound_map
 2023-03-31 18:52:06 -04:00
Nadyr
9ea10c8f6e Merge pull request #5981 from CHOMPStation2/upstream-merge-14720 
[MIRROR] Speed and stuff
 2023-03-31 18:50:30 -04:00
Nadyr
51f4cf8ac7 Merge pull request #5983 from Seris02/petrificationmachine 
small petrification interface next to the alien machine in maint
 2023-03-31 18:49:42 -04:00
Nadyr
0ae9cb1d97 powder that makes you say yes 2023-03-31 18:31:52 -04:00
Nadyr
b3c534e667 powder that makes you say yes 2023-03-31 18:29:41 -04:00
Nadyr
3584ccc029 powder that makes you say yes 2023-03-31 18:28:25 -04:00
Nadyr
71ffa4d99d powder that makes you say yes 2023-03-31 18:27:11 -04:00
Nadyr
f13c7783db powder that makes you say yes 2023-03-31 18:26:29 -04:00
Heroman3003
662030703a Adds Firm Body trait and throwforce resistance 2023-03-31 07:22:12 +00:00
Heroman3003
81c76088bf Merge pull request #14745 from Heroman3003/new-taurs 
Updates wasp taur sprite a bit, adds ant and fat naga taurs
 2023-03-31 07:20:59 +00:00
Rykka Stormheart
c4921dfdf7 Species Sounds Hotfix 2 
Gives Cough/Sneeze/Gasp back default sounds if they lack one in their species list.
Fixes death sound doubling up.
Fixes runtime in sounds - it will now simply return null rather than trying to index the list and failing.
 2023-03-28 21:01:49 -07:00
Casey
9dd95647b7 Merge pull request #14723 from KillianKirilenko/kk-robooze 
Ethanol Processors
 2023-03-27 04:02:43 +00:00
Casey
7aa42e6583 Adds 'drone' versions of mercenary mobs. 2023-03-27 04:01:30 +00:00
Casey
9f1ac553a3 Merge pull request #14731 from Heroman3003/wings 
Adds a whitescale-based version of Demon Wings
 2023-03-27 04:01:23 +00:00
Seris02
f6d1d7265b subtle sounds only when next to 2023-03-26 11:39:42 +08:00
Bib Bob
7eed627c9d reverts sniper buff 2023-03-25 14:04:24 -05:00
Verkister
fc59d4be03 Adds trash eater throw vore mode 
Adds a toggle ability to enable/disable trash eating thrown items on impact (same restrictions apply). Disabled by default.
Also adds a toggle message for vorgan entry log toggle while at it.
 2023-03-25 17:33:49 +02:00
Heroman3003
ad1c6ed5aa Merge pull request #14728 from Seris02/fixaiholo 
fixes unique holograms, their outdated icons, and hologram offsets
 2023-03-25 04:39:36 +00:00
Heroman3003
682a4a457e Merge pull request #14663 from TheGreatKitsune/patch-1 
Fixes item loss when dying as a prommie blob
 2023-03-25 03:05:09 +00:00
Rykka Stormheart
e601048e13 Fixes error with Species Sounds 
Unset ran into an error that did not occur during testing - select_default_species_sound was changed to use pref instead of user, and the testing calls were not updated.

Unathi had no species sounds.
 2023-03-23 05:10:29 -07:00
Seris02
abc62d2d89 petrification interface 2023-03-23 16:43:42 +08:00
Razgriz
b2d8b4b2fe powder that makes you say yes 2023-03-22 14:37:49 -07:00
Razgriz
c057f9f0f8 Merge pull request #5813 from Rykka-Stormheart/shep-dev-barky-noises 
Sound Update: Mob Species Sounds (Gasp/Scream/Pain/Death/Cough/Sneeze)
 2023-03-22 14:32:04 -07:00
Razgriz
d90fcd43ae Merge pull request #5840 from Rykka-Stormheart/shep-dev-mob-injury-system 
Simplemob Injury System
 2023-03-22 14:31:53 -07:00
BlackMajor
9116dd344e Merge pull request #5980 from Seris02/traitfix 
fixes trait prefs from not working on chompcode
 2023-03-22 14:51:01 +13:00
Casey
b32bdc8fbe Merge pull request #14719 from Seris02/traitprefsbuttheyactuallywork 
fixes trait prefs not working and makes a trait pref for stuffing feeder
 2023-03-21 21:51:27 +00:00