cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,124 Commits 5 Branches 0 Tags
e3f92b0f8c160f4865bd2de01ba6fbc9af4074e3
Commit Graph

66124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
e3f92b0f8c powder that makes you say yes 2021-08-24 22:08:02 -04:00
Nadyr
cc0b139508 powder that makes you say yes 2021-08-24 22:05:08 -04:00
Nadyr
829455df51 powder that makes you say yes 2021-08-24 22:02:46 -04:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Nadyr
9fa44f50ce Merge pull request #2829 from Verkister/churnstages 
Adds damage descriptions and effects to partially digested stuff
 2021-08-22 04:15:11 -04:00
Nadyr
531552958b Merge pull request #2827 from KeRSedChaplain/cultdrinks 
Adds heresy to the bar (two new cultist themed drinks)
 2021-08-22 04:13:32 -04:00
Nadyr
ddf3f34dbe Merge pull request #2819 from Raeschen/teshari_inhand_fix 
Brings back teshari in-hand sprites
 2021-08-22 04:11:38 -04:00
Nadyr
0be7cbb15c Merge pull request #2816 from Raeschen/shadekin_horizontal 
Adds 'Horizontal on rest/stun' proc for simplemobs, assigns to shadekin
 2021-08-22 04:10:52 -04:00
Verkister
086d1a04a7 this would work better 2021-08-22 01:58:29 +03:00
Verkister
7ea142e49b test compiles for 1-line slipups are for daytime thinkmeat weh 2021-08-22 01:50:34 +03:00
Verkister
69887fceae Makes contamination still apply overlays on worn items for the prey to notice 2021-08-22 01:42:06 +03:00
Verkister
4903c0b46d Adds damage descriptions and effects to partially digested stuff 
-Adds 4 stages of unwashable descriptions and overlays to indicate the "health" of partially digested items.
-Also optimizes some stuff by moving damage and contamination overlays to only be applied on items upon vorgan release without slapping any of them on stuff that won't be coming out.
 2021-08-22 01:27:38 +03:00
Dan-Neposh
733ddd92a6 WOOPS, YOU HAVE TO PUT THE SOUNDFILES IN YOUR PULL REQUEST 2021-08-19 22:36:32 -04:00
Dan-Neposh
a9f7d85e58 fixes a typo 2021-08-19 22:30:55 -04:00
Dan-Neposh
82312e29c5 adds narsour and cogchamp themselves 2021-08-19 22:07:20 -04:00
Dan-Neposh
a31ed722b0 icons for narsour and cogchamp 2021-08-19 21:05:27 -04:00
Nadyr
e946131a5e Merge pull request #2817 from TheGreatKitsune/micro-step-while-lying 
Adds step mechanics when the target is lying down
 2021-08-18 18:34:20 -04:00
Razgriz
b1884664b1 Merge pull request #2826 from Rykka-Stormheart/shep-dev-pistol-delay 
Changes all pistols to move_delay = 0 via CHOMPEdits
 2021-08-18 15:17:34 -07:00
Rykka
096b64ffb1 Changes all pistols to move_delay = 0 via CHOMPEdits 
Some of these are probably redundant, I did this quickly in response to a request so it could get in before an event.

I'll do a more thorough move_delay lookover later and determine what weapons should be fire-able on the move vs not.
 2021-08-18 14:59:37 -07:00
Razgriz
50b37c581c Merge pull request #2824 from Verkister/voretweaks 
A couple more vore tweaks.
 2021-08-18 14:42:30 -07:00
Razgriz
689ae838c4 Merge pull request #2825 from Rykka-Stormheart/shep-dev-gun-sounds 
Adds custom firing sounds for weapons - Serdy's Request
 2021-08-18 14:39:55 -07:00
Rykka
54b0844ff4 Adds custom firing sounds for weapons - Serdy's Request 
AKM Variants all use ak74.ogg
Glock uses 9mmpistol.ogg
VP70 uses 40pistol.ogg
Molniya uses molniyab.ogg
Plamya uses plamya.ogg
SKS uses sks.ogg
Type 901 uses type901.ogg
Vityaz uses vityaz.ogg
 2021-08-18 14:07:26 -07:00
Verkister
72aef4ab35 A couple more vore tweaks. 
-Makes the mechanical pref popup show the target's selected vorgan.
-Makes the vorepanel content tab automatically switch off icon mode after reaching a certain amount of items inside the vorgan, whether the one belonging to the person or the one they're inside. Current limit 21, which is just enough to fill up the vorepanel window in its default size.
-Makes the icon stuff not cache unique icons for every simplemob to avoid ending up filling the cache with hundreds of identical images of mice and such during the round.
 2021-08-18 17:55:28 +03:00
Razgriz
caf52da6f8 Merge pull request #2823 from Verkister/patch-30 
Removes redundant timer from autotransfer
 2021-08-18 03:39:14 -07:00
Verkister
7e58d6c410 Removes redundant timer from autotransfer 
Duplicated by upstream port.
 2021-08-18 13:05:43 +03:00
Raeschen
468c0a296e separate to _ch file 2021-08-18 08:52:00 +02:00
Raeschen
e5df03dd83 Merge branch 'master' into teshari_inhand_fix 2021-08-18 08:31:26 +02:00
Raeschen
3bd2e33aa5 relocate edits to _ch files 2021-08-18 08:28:40 +02:00
Raeschen
420e14f093 Merge branch 'master' into shadekin_horizontal 2021-08-18 08:26:26 +02:00
Nadyr
441b4142ca Merge pull request #2821 from Verkister/moarvoarfeats 
Adds some new vore features.
 2021-08-17 19:37:10 -04:00
Nadyr
fc8954ddc4 Merge pull request #2820 from lbnesquik/Kot-taur-clothessss 
Adds plague doctor outfits to drake and lizard taurs.
 2021-08-17 19:35:43 -04:00
Nadyr
1f696ab504 Merge pull request #2818 from Verkister/patch-29 
Refluffs phoron oties for chomp lore
 2021-08-17 19:03:05 -04:00
Nadyr
6aa3c81392 Merge pull request #2813 from Raeschen/prbt 
Adds *prbt
 2021-08-17 19:01:46 -04:00
Verkister
6008fbae12 Adds some new vore features. 
-Adds a verb for player simplemobs to slowly heal themselves by using nutrition.
-Adds the new dispersed item digestion mode to vorepanel.
-Makes the vorgan autotransfer features available for players and adds the options to vorepanel.

Looks like the vorepanel tgui interface is getting so bloated that some buttons had to be sacrificed in order to add the new ones due to technical limitations.
-Removed the separate toggles for each individual liquidbelly examine level and makes them use the shared toggle instead.
 2021-08-18 00:43:52 +03:00
lbnesquik
3a611509cf Adds plague doctor outfits to drake and lizard taurs. Probs more to come as i get off my ass. 2021-08-17 23:34:23 +02:00
Raeschen
6a0f6943dd initial commit 2021-08-17 16:09:41 +02:00
Verkister
a6d39fca28 Refluffs phoron oties for chomp lore 
Instead of adapting to Virgo-3B climate, they just ate a bunch of phoron.
 2021-08-17 13:13:09 +03:00
Raeschen
416868cfd0 relocate function for future reuse by other simplemob subtypes. 2021-08-17 08:48:01 +02:00
Raeschen
b76695e685 a long winded learning experience 2021-08-17 08:22:27 +02:00
Raeschen
af51bb0667 ugh 2021-08-17 08:16:47 +02:00
Raeschen
d2147d77b3 Merge branch 'prbt' of https://github.com/Raeschen/CHOMPStation2 into prbt 2021-08-17 08:13:47 +02:00
Raeschen
6deb4e071c Revert "Merge branch 'master' into prbt" 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
 2021-08-17 08:13:00 +02:00
Raeschen
d0b32346a6 Revert "Revert "Merge branch 'master' into prbt"" 
This reverts commit c7f19ecde1.
 2021-08-17 08:12:56 +02:00
Raeschen
cb879c31aa Revert "Fix conflict with master" 
This reverts commit 42eba2a9dc.
 2021-08-17 08:12:43 +02:00
Raeschen
9ef0a0b658 Delete audible_furry_vr.dm 2021-08-17 08:08:35 +02:00
Raeschen
42eba2a9dc Fix conflict with master 2021-08-17 08:01:06 +02:00
Raeschen
c7f19ecde1 Revert "Merge branch 'master' into prbt" 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
 2021-08-17 07:54:00 +02:00
Raeschen
6240ccc5fe Merge branch 'master' into prbt 2021-08-17 07:50:06 +02:00
Raeschen
2055234acf Fix missing comments and commas 2021-08-17 07:47:55 +02:00
Nadyr
e33c4b842f Merge pull request #2814 from Verkister/squeks 
Adds squeaky toy noise as audible emote.
 2021-08-16 18:35:18 -04:00