cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,276 Commits 5 Branches 0 Tags
dcc780f36ea78aeed32107d6d9f194a94dced1fc
Commit Graph

33248 Commits

Author SHA1 Message Date
MeepleMuncher
dcc780f36e allows for deconstruction of kitchen appliances 
should also hopefully allow for kitchen appliances to be upgraded
 2022-09-14 15:14:44 +03:00
Nadyr
bc2886f4c5 Merge pull request #4911 from CHOMPStation2/upstream-merge-13710 
[MIRROR] Fixes Taur Skirt
 2022-09-12 20:51:39 -04:00
Razgriz
183cc66dc0 Nerf proc of appendicitis and viral infection 
If the station event system rolls for these, there is now a 50% chance that they'll just be skipped for the round.
 2022-09-11 21:53:10 -07:00
Nadyr
684c4467fd Merge branch 'master' into upstream-merge-13710 2022-09-10 22:11:06 -04:00
Nadyr
04b97a536f Merge pull request #4909 from CHOMPStation2/upstream-merge-13702 
[MIRROR] Fixes the VR pods to keep your character sprites perfectly copied.
 2022-09-10 22:08:28 -04:00
Nadyr
4e8c0f51da Merge pull request #4908 from CHOMPStation2/upstream-merge-13623 
[MIRROR] [MIRROR] Checks the no_clone modifier stored in DNA records as a path
 2022-09-10 22:07:23 -04:00
Nadyr
29d5ad43cc Merge pull request #4907 from CHOMPStation2/upstream-merge-13622 
[MIRROR] [MIRROR] Organs transfer EMPs to their contents
 2022-09-10 22:07:02 -04:00
Nadyr
3c6b93eb1f Merge pull request #4903 from CHOMPStation2/upstream-merge-13706 
[MIRROR] Adds Taur Skirts
 2022-09-10 22:04:02 -04:00
Nadyr
e7f876c12c Merge pull request #4902 from CHOMPStation2/upstream-merge-13701 
[MIRROR] Fixes Avida's hat not being equippable on earless people
 2022-09-10 22:03:34 -04:00
Nadyr
fcb173ee39 Merge pull request #4899 from CHOMPStation2/upstream-merge-13700 
[MIRROR] Adds colorable magic hat to loadout
 2022-09-10 22:00:20 -04:00
Nadyr
ed5d69ca87 Merge pull request #4882 from CHOMPStation2/upstream-merge-13692 
[MIRROR] Makes Birdsong less memey and more varied
 2022-09-10 21:52:41 -04:00
Nadyr
7002c90512 Merge pull request #4887 from TheGreatKitsune/patch-4 
Give medihound back modules that they should have
 2022-09-10 21:51:46 -04:00
Nadyr
925a759cd9 Merge pull request #4891 from CHOMPStation2/upstream-merge-13684 
[MIRROR] Fixes scaling offsets for bigdragons/woofs/manders
 2022-09-10 21:51:18 -04:00
Nadyr
87450ca441 Merge pull request #4889 from CHOMPStation2/upstream-merge-13680 
[MIRROR] Fixes slime ai again, hopefully
 2022-09-10 21:50:03 -04:00
Casey
61ddc608f1 Fixes Taur Skirt 2022-09-10 21:24:57 +00:00
Casey
cb54de58b9 Merge pull request #13702 from tacoguy7765093/VR-Fix-Super-Jank 
Fixes the VR pods to keep your character sprites perfectly copied.
 2022-09-10 21:06:14 +00:00
Heroman3003
0c95418e2a Merge pull request #13623 from VOREStation/upstream-merge-8696 
[MIRROR] Checks the no_clone modifier stored in DNA records as a path
 2022-09-10 21:03:04 +00:00
Heroman3003
713e0cc95f Merge pull request #13622 from VOREStation/upstream-merge-8697 
[MIRROR] Organs transfer EMPs to their contents
 2022-09-10 21:02:59 +00:00
Casey
b0b6a5b138 Merge pull request #13706 from Novacat/nova-basicfixes 
Adds Taur Skirts
 2022-09-10 20:47:13 +00:00
Casey
c64ea46f68 Merge pull request #13701 from Heroman3003/avidafix 
Fixes Avida's hat not being equippable on earless people
 2022-09-10 20:43:00 +00:00
Casey
b4dfdbd16c Merge pull request #13700 from Heroman3003/dragor-hat 
Adds colorable magic hat to loadout
 2022-09-10 20:41:46 +00:00
Casey
0e33a8669f Merge pull request #13684 from Verkister/patch-122 
Fixes scaling offsets for bigdragons/woofs/manders
 2022-09-10 20:37:00 +00:00
Casey
6347ecd912 Merge pull request #13680 from Heroman3003/slimefix1 
Fixes slime ai again, hopefully
 2022-09-10 20:35:48 +00:00
Casey
2fbd18b67c Merge pull request #13681 from Heroman3003/few-things-aaa 
Fixes a few minor things
 2022-09-10 20:35:43 +00:00
TheGreatKitsune
4e97f432e0 Give medihound back modules that they should have 2022-09-10 09:56:52 -05:00
Razgriz
de4f5064cb Merge pull request #4884 from CHOMPStation2/Razgriz1032-patch-14 
Rename grit pathname
 2022-09-09 17:52:37 -07:00
Razgriz
0e8d363b0b Rename grit pathname 
Renamed Grit pathname because we already have pain_tolerance pathname for halloss damage resistance. It was overwriting Grit.
 2022-09-09 16:19:54 -07:00
Novacat
303d6382aa Merge pull request #13692 from Heroman3003/cheepcheep 
Makes Birdsong less memey and more varied
 2022-09-09 19:57:27 +00:00
Razgriz
95896cde05 Revert "[MIRROR] Makes wounds disappear" 2022-09-09 00:38:08 -07:00
Razgriz
d87e02c355 Fix "grit" positive perk 
Changed traith path from negative to positive.
I'm sure Virgo will figure this out eventually, so no chomp comment.
 2022-09-08 22:33:01 -07:00
Nadyr
85643c0d2c Merge pull request #4865 from CHOMPStation2/upstream-merge-13674 
[MIRROR] Adds neutral trait for synthetics to toggle cosmetic pain messages
 2022-09-07 18:02:10 -04:00
Nadyr
efb2142de9 Merge pull request #4864 from CHOMPStation2/upstream-merge-13675 
[MIRROR] Adds finless shark tail option
 2022-09-07 16:34:11 -04:00
Nadyr
7580697dfd Merge pull request #4862 from CHOMPStation2/upstream-merge-13673 
[MIRROR] Fixes licking wounds of dead/from dead
 2022-09-07 16:23:03 -04:00
Nadyr
fa9c457a05 Merge pull request #4867 from CHOMPStation2/upstream-merge-13677 
[MIRROR] Enables spont TF pref for monkey mobs
 2022-09-07 16:19:28 -04:00
Nadyr
f077fde910 Merge pull request #4858 from CHOMPStation2/upstream-merge-13668 
[MIRROR] Adds "Grit" Positive trait
 2022-09-07 16:18:56 -04:00
Nadyr
553eabccfd Merge pull request #4866 from CHOMPStation2/upstream-merge-13639 
[MIRROR] [MIRROR] Fixes oversight with grafadreka reagent processing.
 2022-09-07 16:18:46 -04:00
Nadyr
b05676a0c9 powder that makes you say yes 2022-09-07 16:14:31 -04:00
Nadyr
e6c29a0276 powder that makes you say yes 2022-09-07 16:12:05 -04:00
Nadyr
7276d043c7 Merge pull request #4863 from CHOMPStation2/upstream-merge-13671 
[MIRROR] More light updates!
 2022-09-07 16:10:31 -04:00
Nadyr
a3b80c7370 powder that makes you say yes 2022-09-07 16:09:00 -04:00
Nadyr
87ccda6a4a Merge pull request #4861 from CHOMPStation2/upstream-merge-13669 
[MIRROR] Fixes a few more runtimes
 2022-09-07 16:06:55 -04:00
Nadyr
52fcd8425b Merge pull request #4860 from CHOMPStation2/upstream-merge-13670 
[MIRROR] Fixes playable nurse spider runtime
 2022-09-07 16:04:32 -04:00
Nadyr
117138d2d4 powder that makes you say yes 2022-09-07 15:57:25 -04:00
Nadyr
29b26401e0 Merge pull request #4856 from CHOMPStation2/upstream-merge-13663 
[MIRROR] Fixes runtime with self-shutoff of PA
 2022-09-07 15:54:55 -04:00
Verkister
f94e3aad59 Fixes _ch leopardmander scaling offset 
Fixes wonky vertical offsets when scaling leopardmanders.
Also fixed the other mobs of the same size but those will be flowing from upstream hopefully soon enough.
 2022-09-07 20:39:17 +03:00
Casey
2ea19f223d Merge pull request #13677 from Verkister/patch-121 
Enables spont TF pref for monkey mobs
 2022-09-06 20:03:42 +00:00
Casey
1e84f968a5 Merge pull request #13639 from VOREStation/upstream-merge-8701 
[MIRROR] Fixes oversight with grafadreka reagent processing.
 2022-09-06 20:02:36 +00:00
Casey
2d6841cee0 Adds neutral trait for synthetics to toggle cosmetic pain messages 2022-09-06 20:02:31 +00:00
Casey
0fc8780121 Adds finless shark tail option 2022-09-06 20:02:27 +00:00
Casey
ceca2956e1 Merge pull request #13671 from Cameron653/light_overlay 
More light updates!
 2022-09-06 19:44:48 +00:00