cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,677 Commits 5 Branches 0 Tags
56b51e8ef2aa359e145eca4d78c7b81400f67315
Commit Graph

32950 Commits

Author SHA1 Message Date
Casey
56b51e8ef2 [READY] Adds Altevian species 2022-08-12 18:05:36 +00:00
TheGreatKitsune
5f0ed62225 Merge master into vore-sprites 2022-08-07 19:38:53 -05:00
Nadyr
570f5c109b Merge pull request #4672 from CHOMPStation2/upstream-merge-13452 
[MIRROR] shalax fluff wrassle secbelt reskin
 2022-08-07 19:39:16 -04:00
Nadyr
1a1fca7867 Merge pull request #4670 from CHOMPStation2/upstream-merge-13458 
[MIRROR] Allows changing of the release verb when expelling stomach contents.
 2022-08-07 19:38:13 -04:00
Nadyr
604c37f716 Merge pull request #4663 from CHOMPStation2/upstream-merge-13443 
[MIRROR] Allows un-obligate bloodsucker to just drink blood normally
 2022-08-07 19:37:19 -04:00
Casey
d75c98d9b6 Allows changing of the release verb when expelling stomach contents. 2022-08-07 19:01:16 -04:00
Nadyr
f838d0c124 Merge pull request #4673 from xnqm8h/serazine-fix 
Fixed some leftover typos preventing the alizene reaction from happening. 🧪
 2022-08-07 18:47:23 -04:00
Nadyr
ad8de5493b powder that makes you say yes 2022-08-07 18:46:44 -04:00
Nadyr
f48fef69d7 Merge pull request #4669 from CHOMPStation2/upstream-merge-13459 
[MIRROR] Allows dislocations to be found.
 2022-08-07 18:43:16 -04:00
Nadyr
ca2f70637b Merge pull request #4666 from CHOMPStation2/upstream-merge-13457 
[MIRROR] Borgeon can now put in NIFs
 2022-08-07 18:40:15 -04:00
Nadyr
d2393d1cec Merge pull request #4665 from CHOMPStation2/upstream-merge-13455 
[MIRROR] Clothing Slot adjustments
 2022-08-07 18:39:50 -04:00
Nadyr
1cc153973c powder that makes you say yes 2022-08-07 18:34:48 -04:00
Nadyr
2d398d008c Merge pull request #4657 from CHOMPStation2/upstream-merge-13437 
[MIRROR] Less Lethal Lung Damage.
 2022-08-07 18:22:02 -04:00
Casey
c5d1d96bc9 shalax fluff wrassle secbelt reskin 2022-08-07 20:14:07 +00:00
xnqm8h
3d7b3e40bf Fixed some leftover typos preventing the alizene reaction from happening. 🧪 
Fixed some leftover typos preventing the reaction from happening.
 2022-08-07 16:13:07 -04:00
Casey
123f29d2fc Merge pull request #13459 from Cameron653/DISLOCATED_FIX 
Allows dislocations to be found.
 2022-08-07 19:54:19 +00:00
Casey
e707646ddb Merge pull request #13457 from TankTheBirb/borgeon 
Borgeon can now put in NIFs
 2022-08-07 19:53:05 +00:00
Casey
11bfb916a0 Merge pull request #13455 from TankTheBirb/Belt-Podzu 
Clothing Slot adjustments
 2022-08-07 19:47:51 +00:00
Casey
fc8890bd7c Allows un-obligate bloodsucker to just drink blood normally 2022-08-07 19:37:24 +00:00
Casey
21e1032369 Merge pull request #13437 from Cameron653/Less_Letal_Lungs 
Less Lethal Lung Damage.
 2022-08-07 19:35:54 +00:00
Casey
827b1cf84f Merge pull request #13439 from Heroman3003/ic-runtime-fix 
Fixes runtime with Integrated Circuits shift-ctrl-click
 2022-08-07 19:35:49 +00:00
xnqm8h
06f95c94d3 Commenting out fallingapples. 
Commenting out fallingapples.
 2022-08-06 21:45:32 -04:00
xnqm8h
00666fcad0 Adding chompedit comments to non chomp files. 
Adding chompedit comments to non chomp files.
 2022-08-06 20:03:59 -04:00
xnqm8h
3dbb49378f Fixes mutation chains for chomp seeds and some reaction formulas 🪴💊 
Fixes missing mutation chains for most of the plant types in seed_datums_ch along with fixing some typos in some chemical reactions. Lastly added a simple description for Bullvalene since it had a placeholder one.
 2022-08-05 16:53:02 -04:00
Razgriz
9da23da882 Merge pull request #4648 from VictorZisthus/right-click-bomb-fix 
Cocoon Crash Counter Code
 2022-08-04 19:43:51 -07:00
Victor Zisthus
a173770f76 Cannibalism update 
The nurse spiders refuse to not target dead spiders of another faction, even when I put in a check for such. The faction check is overriding everything I try to do to stop these cocoon bombs.

So I'm enabling spider cannibalism.

No more cocoon bombs, just more spiders to deal with.

Spiders eat themselves all the time IRL.

LORE ACCURATE BUGFIX.
 2022-08-04 21:41:02 -04:00
Victor Zisthus
1e47056d23 Revert "Cocoon Crash Counter" 
This reverts commit b156551a42.
 2022-08-04 21:29:12 -04:00
Razgriz
855974d00f Merge pull request #4652 from TheGreatKitsune/lick-wounds-nerf 
No longer lick wounds while incapacitated
 2022-08-04 18:26:41 -07:00
TheGreatKitsune
b168dedd58 Add comments 2022-08-04 19:25:40 -05:00
TheGreatKitsune
7e4af9319e No longer lick wounds while incapacitated 2022-08-04 19:23:48 -05:00
xnqm8h
4cacacdd38 Added temp protection to work gloves 
Adds some heat and cold resistance similar to that found on other gloves.
 2022-08-03 22:22:10 -04:00
Victor Zisthus
b156551a42 Cocoon Crash Counter 
FIXES #4446
Let's GOOOOOO!

Added spiders to the list of things to ignore for the cocoon targeting.
 2022-08-03 00:54:09 -04:00
Rykka Stormheart
2a661d1a5b Update xenochimera_trait_vr.dm 2022-08-02 00:54:45 -06:00
Rykka
f33bed6320 Sharp Melee + Numbing Fangs no longer removes chimera special claws 
No idea how this got missed but oops.
 2022-08-01 22:35:00 -06:00
Nadyr
0e6781f542 Merge branch 'master' into upstream-merge-13426 2022-08-01 22:36:21 -04:00
Nadyr
5d2105ea36 Merge pull request #4637 from CHOMPStation2/upstream-merge-13423 
[MIRROR] get_random_colour() now prepends a #
 2022-08-01 22:32:12 -04:00
Nadyr
6fa8509ad0 Merge pull request #4635 from CHOMPStation2/upstream-merge-13382 
[MIRROR] Adds in a modified Replicator Transformation Device
 2022-08-01 22:24:28 -04:00
Nadyr
839e74134f Merge pull request #4639 from CHOMPStation2/upstream-merge-13427 
[MIRROR] Smol examine fix
 2022-08-01 22:19:07 -04:00
Nadyr
b5bc0a2947 Merge pull request #4638 from CHOMPStation2/upstream-merge-13317 
[MIRROR] Makes AI not flee while in a tummy
 2022-08-01 22:12:02 -04:00
Nadyr
6588166319 Merge pull request #4633 from CHOMPStation2/upstream-merge-13416 
[MIRROR] Adds Zorren and Fennec DSI prosthetic brands
 2022-08-01 22:03:04 -04:00
C.L
2e99cc8de8 Adds in a modified Replicator Transformation Device 2022-08-01 21:59:31 -04:00
Nadyr
4d099ab10b Merge pull request #4631 from CHOMPStation2/upstream-merge-13406 
[MIRROR] Selective bellymode now selectable and pref-adjustible
 2022-08-01 21:52:40 -04:00
Nadyr
eddbd921f8 powder that makes you say yes 2022-08-01 21:47:06 -04:00
Nadyr
8ccc49a99e Merge pull request #4628 from CHOMPStation2/upstream-merge-13403 
[MIRROR] xenochimera unarmed attack and regeneration tweaks
 2022-08-01 21:35:45 -04:00
Nadyr
eae5a43733 powder that makes you say yes 2022-08-01 21:31:34 -04:00
Nadyr
e44f59b8bc Merge branch 'master' into upstream-merge-13406 2022-08-01 21:29:15 -04:00
Nadyr
645701d10e Merge pull request #4630 from CHOMPStation2/upstream-merge-13407 
[MIRROR] It is a lovely morning in the station
 2022-08-01 21:17:40 -04:00
Nadyr
2114f8d0a2 Merge pull request #4615 from CHOMPStation2/upstream-merge-13398 
[MIRROR] adds "selective" bellymode for mobs
 2022-08-01 21:17:25 -04:00
Nadyr
60fa8cf52a powder that makes you say yes 2022-08-01 21:11:19 -04:00
Nadyr
07ce78a0d3 powder that makes you say yes 2022-08-01 21:06:29 -04:00