cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-03 21:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,733 Commits 8 Branches 0 Tags
2e15527ef034fb8442cd907dfc8a7d5e9ad2af33
Commit Graph

11924 Commits

Author SHA1 Message Date
Chompstation Bot 2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00
Razgriz 1ad25e5cdb Mouse spontaneous vore changes 
For mice, I changed the following:
Allowed for being spontaneous prey.
Disallowed for being spontaneous predator.
 2020-11-19 01:47:09 -07:00
Razgriz cbf220a4b7 Undo accidental commit to master with another commit to master 
lol
 2020-11-19 01:46:26 -07:00
Razgriz 3fece6ec6b Mouse spontaneous vore changes 
For mice I changed the following:
Allowed for being spontaneous prey.
Disallowed for being spontaneous predator.
 2020-11-19 01:45:39 -07:00
Novacat c73420518a Merge pull request #9323 from VOREStation/upstream-merge-7759 
[MIRROR] Fix Simplemob+ Organs
 2020-11-18 22:14:58 +00:00
Verkister 6699d74e8c Merge pull request #9318 from VOREStation/Verkister-patch-5 
Fixes hotkey emotes not getting the proper textbox
 2020-11-17 22:06:07 +00:00
cadyn 4a6b57ae01 Update negative_ch.dm 2020-11-16 00:00:16 -08:00
cadyn c25d59d84b fix singularity metabolism bruh 2020-11-15 23:56:01 -08:00
cadyn 4e2da5ae98 fix stupid bugs ree 2020-11-15 23:52:27 -08:00
Razgriz 5afa72a83e Merge pull request #844 from CHOMPStation2/metroid 
Current Metroid Progress
 2020-11-15 13:59:33 -07:00
Verkister e612636a10 Merge pull request #9309 from VOREStation/Verkister-patch-5 
Fixes pixel shifting breaking offsets
 2020-11-15 19:08:13 +00:00
cadyn e22d99d936 Merge pull request #847 from CHOMPStationBot/upstream-merge-9298 
[MIRROR] Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 02:09:07 -08:00
cadyn d75c393d2f Merge pull request #846 from CHOMPStationBot/upstream-merge-9307 
[MIRROR] Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss
 2020-11-15 02:08:13 -08:00
cadyn 1db7b1d2e6 Merge pull request #845 from CHOMPStationBot/upstream-merge-9304 
[MIRROR] Balance fixes and bugfixes
 2020-11-15 02:07:40 -08:00
cadyn d2a2b301cc Merge pull request #829 from cadyn/traits-v2 
Cadyn's traits v2
 2020-11-15 00:54:35 -08:00
cadyn a67c751841 Merge branch 'master' into upstream-merge-9307 2020-11-15 00:48:22 -08:00
Verkister f5c125eaff Merge pull request #9298 from Tenryumi/piper-hair 
Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 08:46:24 +00:00
Chompstation Bot f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Razgriz 02d51b5756 Merge branch 'master' into metroid 2020-11-14 15:25:04 -07:00
Novacat 1efc4bcd9f Merge pull request #9304 from Novacat/nova-basicfixes 
Balance fixes and bugfixes
 2020-11-14 17:54:59 +00:00
Razgriz f70d48cfce Update Metroid Progress 2020-11-14 04:17:46 -07:00
Razgriz cd71309e32 Add files via upload 2020-11-14 04:12:57 -07:00
cadyn b4a9632e16 Add logging for adrenaline rush being activated. 2020-11-13 22:54:02 -08:00
cadyn 33a411e662 Feedbaaack 2020-11-13 22:46:58 -08:00
cadyn 6c01fa902d swapped some numbers by mistake :p 2020-11-12 00:39:28 -08:00
Razgriz e4e0b08da6 Merge pull request #788 from cadyn/ballistics-v2 
Ballistics v2
 2020-11-11 19:32:40 -07:00
Razgriz c0ebd7d70a Merge pull request #821 from CHOMPStationBot/upstream-merge-9293 
[MIRROR] Couple little borgo belly tweaks.
 2020-11-11 19:30:07 -07:00
Razgriz 4545f66e7c Update dog_sleeper_vr.dm 2020-11-11 19:12:11 -07:00
Cadyn 6d5c74aa3c forgot the </span> oops 2020-11-11 13:55:57 -08:00
Cadyn 6d35d3f025 4.0 slowdown instead of 2.0 2020-11-11 13:46:09 -08:00
Cadyn 953b47764c Cadyn's traits v2 2020-11-11 12:34:31 -08:00
cadyn 29645e04e1 adding #ifndef for gaussian_random 2020-11-10 15:15:16 -08:00
Razgriz 5d1977b324 Merge pull request #817 from CHOMPStationBot/upstream-merge-9287 
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
 2020-11-08 23:41:34 -07:00
Chompstation Bot cb57a3061b Couple little borgo belly tweaks. 2020-11-08 17:29:36 +00:00
Chompstation Bot 018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Razgriz b65e414815 Merge pull request #811 from CHOMPStationBot/upstream-merge-9284 
[MIRROR] Adds a new marking.
 2020-11-07 11:57:58 -07:00
Verkister 8bac06a913 Merge pull request #9284 from Verkister/bean 
Adds a new marking.
 2020-11-07 14:31:12 +00:00
Cadyn 6fa317794b Cadyn's ballistic Overhauls V2 Finale 2020-11-05 16:44:47 -08:00
Razgriz 155421f465 Merge pull request #803 from cadyn/bugfixeroonis 
bugfixing my own shit
 2020-11-04 23:17:04 -07:00
Cadyn 67326bf93a bugfixing my own shit 2020-11-04 20:26:48 -08:00
Razgriz a71b3c971c Merge pull request #798 from r4d6/photosynthesis 
Make synths able to take the Photosynthesis trait.
 2020-11-03 19:40:44 -07:00
Razgriz 44e62accd5 Merge pull request #794 from CHOMPStationBot/upstream-merge-9274 
[MIRROR] brings medihound hypo in-line with medihound sleeper
 2020-11-03 19:38:15 -07:00
r4d6 e3d7e63652 Make synths able to take the Photosynthesis trait. 2020-11-03 10:18:10 -05:00
Cadyn 67499d28c5 Ballistics v2 draft v2 
Introducing debugging messages and actually working ballistics
 2020-11-02 18:03:47 -08:00
Verkister d3e62eab22 Merge pull request #9274 from Andromeda-K22/borg_hypo_buff 
brings medihound hypo in-line with medihound sleeper
 2020-11-02 08:49:29 +00:00
Razgriz 9b0386ac73 Merge pull request #789 from CHOMPStationBot/upstream-merge-9265 
[MIRROR] Ports Pixel shifting.
 2020-10-31 23:45:54 -07:00
Verkister 2e68ca894d Merge pull request #9265 from Detective-Google/pixel-shift 
Ports Pixel shifting.
 2020-10-31 19:37:42 +00:00
Cadyn b3ba48084f Ballistics v2 draft 2020-10-31 12:21:21 -07:00
r4d6 207d2e03fb Chomps Edits & optimisation 2020-10-30 17:01:03 -04:00
r4d6 2505645e1b Show/Hide Nutrition Level 2020-10-30 16:33:22 -04:00