cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-02 19:10:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,022 Commits 10 Branches 0 Tags
fcde43eaae6cdc5281cdfe21c8cb9ecefb431dd1
Commit Graph

31619 Commits

Author SHA1 Message Date
Razgriz fcde43eaae Merge pull request #3672 from CHOMPStation2/upstream-merge-12218 
[MIRROR] No Quantum Pads on Shuttles
 2022-02-16 14:26:38 -07:00
Razgriz 41832fdc16 Merge pull request #3670 from CHOMPStation2/upstream-merge-12210 
[MIRROR] [MIRROR] Cybernetic Augments and Sick Tats
 2022-02-16 14:26:02 -07:00
Razgriz 15d182432a Merge pull request #3668 from CHOMPStation2/upstream-merge-12212 
[MIRROR] Admin resize adjustments
 2022-02-16 14:25:11 -07:00
Razgriz 66711ab5b4 Merge pull request #3667 from CHOMPStation2/upstream-merge-12211 
[MIRROR] Fixes Ghost Sight being missing from Preference verbs
 2022-02-16 14:10:19 -07:00
Razgriz 21597607bc Merge pull request #3666 from Holdelta/bestdrink 
Pilk
 2022-02-16 14:10:02 -07:00
Casey 07ab730aa7 Merge pull request #12227 from Very-Soft/absorblangs 
Absorb Languages
 2022-02-14 05:28:33 +00:00
Casey fc604df1c1 Merge pull request #12218 from Very-Soft/noqpadsonshuttls 
No Quantum Pads on Shuttles
 2022-02-13 21:50:23 +00:00
Casey d4c693378d Merge pull request #12210 from VOREStation/upstream-merge-8200 
[MIRROR] Cybernetic Augments and Sick Tats
 2022-02-13 21:48:53 +00:00
Casey 42df3abc43 Merge pull request #12212 from Very-Soft/resizetime 
Admin resize adjustments
 2022-02-13 12:22:20 +00:00
Casey 1c87f56fc5 Merge pull request #12211 from Heroman3003/sightfix 
Fixes Ghost Sight being missing from Preference verbs
 2022-02-13 12:07:44 +00:00
Razgriz 23bff588e7 Merge pull request #3663 from CHOMPStation2/upstream-merge-12208 
[MIRROR] Tether passage blockades
 2022-02-13 01:46:04 -07:00
Razgriz 856af2785f Merge pull request #3659 from CHOMPStation2/upstream-merge-12200 
[MIRROR] Adds Slicker hair and Tall Bunny ears
 2022-02-13 01:45:54 -07:00
Test Turtle 270f307b7c Pilk 
What it says on the tin.
 2022-02-13 00:42:21 -08:00
Razgriz ea5b01ad69 Merge pull request #3653 from CHOMPStation2/upstream-merge-12191 
[MIRROR] strapless bag
 2022-02-13 01:31:20 -07:00
Razgriz f9f1a680e0 Merge pull request #3661 from CHOMPStation2/upstream-merge-12205 
[MIRROR] fixes a couple typos
 2022-02-13 01:22:53 -07:00
Razgriz 568269f2c6 Merge branch 'master' into upstream-merge-12200 2022-02-13 01:22:42 -07:00
Razgriz 8eb3523fb8 powder that makes you say yes 2022-02-13 01:22:28 -07:00
Razgriz 6450edb58b Merge pull request #3658 from CHOMPStation2/upstream-merge-12199 
[MIRROR] Kitty ear right only 20
 2022-02-13 01:22:00 -07:00
Razgriz c7d22ba876 Merge pull request #3656 from CHOMPStation2/upstream-merge-12196 
[MIRROR] Don't build ladders on shuttles
 2022-02-13 01:21:25 -07:00
Razgriz ad2e88fdf6 Merge branch 'master' into upstream-merge-12191 2022-02-13 01:18:29 -07:00
Razgriz e58053d211 powder that makes you say yes 2022-02-13 01:17:59 -07:00
Razgriz 239cf5dc7f Merge pull request #3652 from CHOMPStation2/upstream-merge-12190 
[MIRROR] Adding text variables to vore-belly descriptions
 2022-02-13 01:17:24 -07:00
Razgriz 3a23ec5ba2 Merge pull request #3650 from CHOMPStation2/upstream-merge-12188 
[MIRROR] Size Standardization Bracelet
 2022-02-13 01:16:22 -07:00
Razgriz bbe7dc82e1 Merge pull request #3649 from CHOMPStation2/upstream-merge-12187 
[MIRROR] Makes xenochimera able to eat raw fish
 2022-02-13 01:15:44 -07:00
Razgriz f686e22fb2 Merge pull request #3622 from Rykka-Stormheart/shep-dev-trait-tweaks 
[WIP] Trait Tweaks - Heavyweight Changes + Stubborn trait, etc
 2022-02-13 01:09:54 -07:00
Casey 22d7e1b856 Tether passage blockades 2022-02-13 06:41:40 +00:00
Casey 764adff550 Merge pull request #12205 from PastelPrinceDan/typofix 
fixes a couple typos
 2022-02-13 02:43:07 +00:00
Casey 5ebb86b603 Adds Slicker hair and Tall Bunny ears 2022-02-12 21:34:38 +00:00
Casey 234a743321 Merge pull request #12199 from TheDavestDave/kitty-ear-6 
Kitty ear right only 20
 2022-02-12 20:59:22 +00:00
Casey a00e99ac81 Merge pull request #12196 from Very-Soft/noladdersonshuttle 
Don't build ladders on shuttles
 2022-02-11 21:49:21 +00:00
Casey 0319e46850 strapless bag 2022-02-11 21:36:25 +00:00
Casey c6be6e078e Merge pull request #12190 from ktccd0/ktccd-dev-VoreBellyDescUpdate 
Adding text variables to vore-belly descriptions
 2022-02-11 21:35:13 +00:00
Casey a503fa1c7f Merge pull request #12188 from Very-Soft/yeah! 
Size Standardization Bracelet
 2022-02-10 00:57:10 +00:00
Casey a13794c60f Merge pull request #12187 from Heroman3003/fishochimera 
Makes xenochimera able to eat raw fish
 2022-02-09 15:05:26 +00:00
Cyrelius baba26d565 Merge branch 'CHOMPStation2:master' into master 2022-02-08 23:29:16 -08:00
Cyrelius 7a30bfb9d5 Update mechfab_designs_ch.dm 
Missed a line break.  un-missed.
 2022-02-08 23:28:06 -08:00
Cyrelius aa6821e8a1 Update mechfab_designs_ch.dm 
Fix minor spelling mistake.
 2022-02-08 23:27:14 -08:00
Cyrelius 79182736ed Update circuits_ch.dm 
Add Phazon circuits to the circuit imprinter.
 2022-02-08 23:26:10 -08:00
Razgriz 350c8be012 Merge pull request #3641 from Holdelta/materials-update 
Update to Sheet Materials
 2022-02-08 14:19:40 -07:00
Test Turtle 3c06b4dc19 Update to Sheet Materials 
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
 2022-02-07 17:20:45 -08:00
Casey b83034829f Merge pull request #12173 from KillianKirilenko/kk-test 
Allergen Reaction Tuning
 2022-02-07 23:17:12 +00:00
Rykka 2848d3cc48 Fixes neutral apply being named wrong 2022-02-07 08:04:39 -08:00
Rykka 549c1bc98f Changes Heavyweight to Stubborn (Neutral), renames combat heavyweight to heavyweight 
Also adds slam feedback to ruby slime effect.
 2022-02-07 07:15:04 -08:00
Rykka 7286bcfb31 [WIP] Trait Tweaks - Heavyweight + Combat Heavyweight, etc 
Heavyweight's effect has been moved to a neutral trait of the same name.
Combat Heavyweight replaces Heavyweight, offers reduction on all incoming stuns + resistance to knockdown effects.

Trait Changes requested by Cyrus:
Pain Intolerance + Intolerance High changed to cost 2 + 3 respectively.
Big + Giant Mouth are now neutral. They're literally just "I can eat food faster haha."

Other Changes:
Feedback on AI/Mob mech punch if the player or mob is resistant to the effect of the punch.

More TBD.
 2022-02-07 07:15:04 -08:00
Nadyr e34ca52a87 Merge branch 'master' into upstream-merge-12168 2022-02-06 22:08:28 -05:00
Nadyr 1c9386b2bd Merge pull request #3628 from CHOMPStation2/upstream-merge-12165 
[MIRROR] The final Item Bank patch?
 2022-02-06 22:07:05 -05:00
Nadyr 524db7ba79 Merge pull request #3625 from CHOMPStation2/upstream-merge-12164 
[MIRROR] talon miner
 2022-02-06 21:58:06 -05:00
Nadyr 6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05:00
Nadyr 77f4e9fb63 Merge pull request #3627 from CHOMPStation2/upstream-merge-12144 
[MIRROR] exosuit cargo expansion equipment
 2022-02-06 21:51:00 -05:00
Nadyr 7f75efc328 powder that makes you say yes 2022-02-06 21:47:41 -05:00