cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 06:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,211 Commits 8 Branches 0 Tags
a1864adb4e4d4e41a04cf3cfd985d16caa87e49d
Commit Graph

12002 Commits

Author SHA1 Message Date
Razgriz
ea80be587b Merge pull request #750 from MisterGrimm/GoodbyeMicromechs 
Commenting out micro mech stuff
 2021-01-08 15:20:57 -07:00
Nadyr
4182adfb19 Update station_vr.dm 2021-01-07 22:26:38 -05:00
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Razgriz
7d9c02a14a Merge pull request #1079 from Sharkmare/patch-1 
Changing shadekin to RESTRICTED from WHITELISTED
 2021-01-05 00:14:31 -07:00
Razgriz
0fe5447fe5 Update types_ch.dm 2021-01-03 20:11:44 -07:00
Sharkmare
21463cd69b Changing shadekin to RESTRICTED from WHITELISTED 
This makes it so shadekin is never a selectable language but rather has to be assigned by the game automatically, similar to how root talk on diona behaves. 

This may break carbon shadekin from selecting this language if they dont assign it the same way diona do.
Howevcer we don't plan to use Shadekin carbons soooooo, yeah.
 2021-01-03 22:23:52 +01:00
Verkister
1df71bdd8a Merge pull request #9525 from VOREStation/Verkister-patch-6 
Makes pixel shifting work while resting
 2021-01-03 10:10:25 +00:00
Razgriz
834294ac49 Merge pull request #1046 from CHOMPStationBot/upstream-merge-9493 
[MIRROR] More mob tweaks
 2021-01-03 00:07:39 -07:00
Novacat
e8bebaf761 Merge pull request #9524 from Heroman3003/shadehud2 
Consolidates and updates shadekin energy/darkness HUD
 2020-12-27 07:34:07 +00:00
Razgriz
83dc173f9c Update simple_mob_vr.dm 2020-12-23 03:41:01 -07:00
Chompstation Bot
3d2f5f8251 More mob tweaks 2020-12-22 19:57:09 +00:00
Kassc
dcb8a1d07c Merge pull request #1025 from Darlantanis/Leopardmander 
Leopardmander vore mob
 2020-12-19 16:31:45 -05:00
Shadowfire
d15968eff6 Last Christmas! 
Final adjustments to the presents!
New fat taur sprite with three colors and a vulp skullmask that totally doesnt look like Churo from Different (TM)! Sprites made by our good friend Blitzkrieg
Merry Christmas all!
 2020-12-18 17:38:55 +01:00
Darlantan
6541cb8e69 Synx grammar fixes 2020-12-16 05:11:55 -05:00
Darlantan
adfa05e782 Leopardmandar mob 
Vore mob from Serdy with healing guts
 2020-12-16 05:11:28 -05:00
Razgriz
82710d4c06 Merge pull request #1007 from Darlantanis/SpeciesAndTweaks 
Species and tweaks
 2020-12-14 01:22:46 -07:00
Darlantan
16f87c7d0f Forgot a wiki link 2020-12-13 07:23:52 -05:00
Darlantan
eefda2a9df Enables alraune, zaddat, disables greys, fixes wiki inks 2020-12-13 07:06:06 -05:00
Razgriz
78ba9a7566 Merge pull request #1003 from CHOMPStationBot/upstream-merge-9448 
[MIRROR] Fixes some borgo belly runtimes
 2020-12-12 15:43:21 -07:00
Razgriz
f786f38dd9 Merge pull request #996 from CHOMPStationBot/upstream-merge-9438 
[MIRROR] Adds Verie's fluff items + framework for hair accessories
 2020-12-12 15:41:50 -07:00
Razgriz
2eee14cd3d Merge pull request #993 from Darlantanis/synxfixes 
Synx runtime, parasitic variable
 2020-12-12 15:33:58 -07:00
Razgriz
5b68992d9f Update dog_sleeper_vr.dm 2020-12-12 15:04:55 -07:00
Chompstation Bot
2e94dfd679 Fixes some borgo belly runtimes 2020-12-12 20:08:54 +00:00
Novacat
1ca5759a71 Merge pull request #9446 from Very-Soft/les-violent-cass 
less violent cass
 2020-12-12 07:00:18 +00:00
Chompstation Bot
f7df37c72d Adds Verie's fluff items + framework for hair accessories 2020-12-11 12:13:12 +00:00
Darlantan
1266d1f6cb Fixes null.GetVoice() runtime, adds parasitic cariable 2020-12-09 02:44:00 -05:00
Razgriz
42de071189 Merge pull request #962 from CHOMPStationBot/upstream-merge-9406 
[MIRROR] Implements negative trait "Neural hypersensitivity"
 2020-12-08 02:02:28 -07:00
Nadyr
1191898927 Update negative.dm 2020-12-08 03:32:12 -05:00
Nadyr
2875dd109c Merge pull request #974 from Darlantanis/LiquidBelliesPort 
Liquid Bellies TGUI Port
 2020-12-08 03:06:32 -05:00
Nadyr
481f5d40b6 Merge pull request #967 from CHOMPStationBot/upstream-merge-9412 
[MIRROR] Fixes proteans losing languages when un-blobbing
 2020-12-08 03:02:35 -05:00
Razgriz
42ca8725c8 Merge pull request #959 from CHOMPStationBot/upstream-merge-9401 
[MIRROR] Adds 2 new maintenance predators: Sect queens and defanged xenomorphs
 2020-12-07 21:30:45 -07:00
Darlantan
26665fbf83 Reactivates liquid vore, fixes mode addons 2020-12-06 05:56:51 -05:00
Novacat
bb6d7da18a Merge pull request #9412 from VOREStation/Verkister-patch-6 
Fixes proteans losing languages when un-blobbing
 2020-12-05 16:13:43 +00:00
Chompstation Bot
0368ff40ae Implements negative trait "Neural hypersensitivity" 2020-12-04 20:06:39 +00:00
Novacat
51f032d023 Merge pull request #9401 from Tenryumi/brads-maint-preds 
Adds 2 new maintenance predators: Sect queens and defanged xenomorphs
 2020-12-03 02:47:21 +00:00
Novacat
552ab27a2a Merge pull request #9389 from Novacat/nova-basicfixes 
Removes bug in Protean Regeneration
 2020-12-01 14:50:01 +00:00
Razgriz
63170b9c8f Merge pull request #948 from CHOMPStationBot/upstream-merge-9374 
[MIRROR] Makes pixel shifting work with custom offsets
 2020-11-30 23:20:13 -07:00
Razgriz
bc04558f0d Merge pull request #940 from cadyn/fixtraits 
Fix broken ass trait bullshit
 2020-11-30 23:16:33 -07:00
Razgriz
d2a21b1315 Merge pull request #950 from CHOMPStation2/RazgrizBranch1 
ohno
 2020-11-30 23:13:51 -07:00
Razgriz
6a38e02c0e ohno 2020-11-30 15:20:28 -07:00
cadyn
26d1977857 Merge pull request #941 from cadyn/fixbullets 
Ballistics v3.1 Balancing and fixes
 2020-11-30 10:50:19 -08:00
cadyn
170800542a Merge pull request #909 from CHOMPStationBot/upstream-merge-9335 
[MIRROR] Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
 2020-11-30 10:23:12 -08:00
Novacat
4c72df2720 Merge pull request #9374 from VOREStation/Verkister-patch-6 
Makes pixel shifting work with custom offsets
 2020-11-30 07:23:31 +00:00
Cadyn
670017d41b Ballistics v3.1 2020-11-29 04:51:18 -08:00
Cadyn
c69d43a3ed Fix broken ass trait bullshit 2020-11-28 20:22:50 -08:00
Novacat
eac394142c Merge pull request #9370 from VOREStation/upstream-merge-7755 
[MIRROR] Fixes pointing going under mobs.
 2020-11-27 23:11:36 +00:00
cadyn
16b4079be0 Merge pull request #917 from CHOMPStation2/RazgrizBranch1 
Change frontier phaser beam-type to ACTUALLY BE a phaser
 2020-11-25 22:42:15 -08:00
cadyn
855f42ec48 Fix conflicts 2020-11-25 20:22:48 -08:00
cadyn
e9b6e94fa2 Fix conflicts 2020-11-25 20:20:07 -08:00
Razgriz
e6a6c4267a Remove mob class for replicant because that won't work 2020-11-24 18:10:53 -07:00