cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,835 Commits 7 Branches 0 Tags
4be86bee496f536b3d8e6ed46ffbc637203efc71
Commit Graph

37048 Commits

Author SHA1 Message Date
Razgriz
4be86bee49 Merge pull request #142 from CHOMPStation2/Razgriz1032-patch-18 
Groin to mouth marking
 2020-01-14 17:04:56 -07:00
Razgriz
d5413574b4 Groin to Snout marking 2020-01-13 20:47:21 -07:00
TheFurryFeline
fb2b7dc49c Allows Quick-NIFing for most staff 
Changelog Notes:

- Adds Quick NIF ability to those with R_MOD, R_DEBUG, R_EVENT, and R_FUN.
 2020-01-13 22:37:11 -05:00
Razgriz
6be7d7e75a Merge pull request #140 from CHOMPStation2/Razgriz1032-patch-17 
Update sprite_accessories_ch.dm
 2020-01-13 20:27:17 -07:00
Razgriz
5ce1acaf58 Merge pull request #138 from CHOMPStation2/Razgriz1032-patch-16 
Indent fix
 2020-01-13 20:22:43 -07:00
Razgriz
8d636ea4b0 Update sprite_accessories_ch.dm 2020-01-13 20:21:57 -07:00
Razgriz
e3b5cd6c0b Update tools.dm 2020-01-13 19:47:35 -07:00
Razgriz
1cfc6cc514 WHAT IS WRONG WITH YOU 
It won't freaking compile. This is the original file now. No mentions of resleeving sickness
 2020-01-13 19:43:11 -07:00
Razgriz
3cce0a1bfa Remove Resleeving Sickness 2020-01-13 19:25:26 -07:00
Razgriz
89257f4f73 Remove Resleeving Sickness 2020-01-13 19:08:14 -07:00
Razgriz
d3e875d753 Resleeving sickness removal 2020-01-13 19:07:27 -07:00
Razgriz
549929817e Remove Resleeving sickness 2020-01-13 19:04:55 -07:00
Razgriz
50609a9b1d Update machines.dm 2020-01-13 19:03:26 -07:00
Razgriz
715c056bb1 Remove sleeving cure 2020-01-13 18:55:11 -07:00
Razgriz
ff138d6b88 Remove sleeving cure 
As part of removing resleeving sickness
 2020-01-13 18:53:47 -07:00
Razgriz
3009bade9e Remove sleeving cure 
Removing resleeving sickness
 2020-01-13 18:49:46 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Razgriz
5e21c5b07f Shut up Travis 2020-01-13 14:36:42 -07:00
Razgriz
04a1aadfbe Merge pull request #136 from TheFurryFeline/patch-5 
Chomp-Specific Panel Save
 2020-01-13 13:42:58 -07:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Razgriz
b14866a20f Merge pull request #126 from Ketrai/master 
Refactors cakes, implements chaos cake proper.
 2020-01-13 13:30:28 -07:00
TheFurryFeline
ef567b9acc Chomp-Specific Panel Save 
Changelog Notes:

- Changes vore panel saving output to display Chompstation-specific, not Virgo.
 2020-01-13 15:18:00 -05:00
Hawk_v3
f641220882 Compilation fixing, and Phorochem depreciation fix. 
We should now be good to go! Praise Travis!
 2020-01-13 20:07:30 +00:00
Hawk_v3
6dcf1520b4 Let's get this wrapped up and ready to go. 
Removed all KHI references, and the Vore AI Law stuff.
 2020-01-13 19:38:10 +00:00
izac112
f093367c69 fixed stupid tab 2020-01-13 20:32:30 +01:00
izac112
097d8e8790 Removes the "Physical" sides of the sleeving sickness 
Aka the brute, burn, pain and melee damage modifiers.

Signed-off-by: izac112 <izac10@live.com>
 2020-01-13 20:29:07 +01:00
izac112
8423b036b8 Reduces duration to 25 minutes on a un-upgraded machine 2020-01-13 20:27:24 +01:00
izac112
5713226986 Vore death or not should be the same 2020-01-13 20:19:18 +01:00
Hawk_v3
4c18d156cd Actual fix. 
Commas MUST go on the end of comments in the middle of a list. The fail is normally the line ABOVE the one Travis reports.
 2020-01-13 19:06:19 +00:00
Hawk_v3
f36bda0ffd Or is this the list fix? I can't read AWK and regex. 
I know where the file IS, just...
 2020-01-13 19:01:15 +00:00
Hawk_v3
33c345c34a Fixing lists for merge. 
Missing commas, man.
 2020-01-13 18:45:44 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Novacat
d7962d0448 Merge pull request #6441 from Heroman3003/droppodfix 
Fixes droppod spawning wrong subtype
 2020-01-13 09:10:04 -05:00
Heroman3003
9e31d82dd5 Decreases chance 2020-01-13 18:16:46 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Heroman
737d37321b Fixes droppod spawning wrong subtype 2020-01-13 17:48:33 +10:00
Novacat
fcd8fd1370 Merge pull request #6440 from Heroman3003/droppodfix 
Fixes drone droppod not being announced
 2020-01-13 02:04:30 -05:00
Heroman
aa53bdc0ed Fixes drone droppod not being announced 2020-01-13 16:51:12 +10:00
Novacat
c1a52de67b Merge pull request #6438 from Heroman3003/dronefix 
Makes drone age restriction based on config setting too
 2020-01-13 01:37:11 -05:00
Heroman
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Razgriz
271b293a63 Merge pull request #131 from CHOMPStation2/Sharkmare-Drone++ 
Assembly (Drone) buff
 2020-01-12 21:41:26 -07:00
Razgriz
3f56b514e4 Merge pull request #129 from CHOMPStation2/Sharkmare-patch-Circuit 
Fixing the can hold list of the circuit bag again
 2020-01-12 21:41:09 -07:00
Razgriz
fc29f80132 Merge pull request #121 from CHOMPStation2/Sharkmare-🥚 
🥚
 2020-01-12 21:40:47 -07:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Novacat
7344a6f953 WE ALWAYS DELIVER!! 2020-01-12 22:02:04 -05:00
Hawk_v3
c51046191b Merge remote-tracking branch 'upstream/upstream-merge-6623' 2020-01-13 00:02:11 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
9c7e1f82af Fixing Travis formatting part 2 
Adding a parenthesis at the end of a comment because Travis.
 2020-01-12 15:44:47 -08:00
Hawk_v3
697641a913 Indentation Fix 
Travis checks for proper closure. While this might not actually fix it, it's expecting to see ) at the end of the line, as I've run into this one before.
 2020-01-12 23:30:34 +00:00