cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,891 Commits 5 Branches 0 Tags
ca8e9dd2d2413d9021ab4ca2867fc5e8ed6be6f5
Commit Graph

24621 Commits

Author SHA1 Message Date
Razgriz
ca8e9dd2d2 Merge pull request #157 from Rykka-Stormheart/shep-dev-round-end-stats 
Port over Roundstats System
 2020-01-17 00:14:21 -07:00
Razgriz
575d9ffb36 Merge pull request #159 from Vulpias/master 
Egglaying REWORKED
 2020-01-16 23:56:36 -07:00
Razgriz
69bf70b900 Merge pull request #113 from CHOMPStation2/Razgriz1032-patch-14 
Hardcoded firedoors for elevators
 2020-01-16 23:55:13 -07:00
Razgriz
662a6b3f4a Merge pull request #152 from Kazzc/RSpice 
Improved Request Spice
 2020-01-16 23:54:31 -07:00
Razgriz
12a2cfffba Merge pull request #156 from Ketrai/cakefixxx 
removes carpmeat from chaos cake recipe.
 2020-01-16 23:53:34 -07:00
TheFurryFeline
8213b7ca1f Cotton Is Tasty 
Changelog Notes:

- Backports Cotton hair lost in rebase. Work from https://github.com/CHOMPstation/CHOMPstation/pull/186
 2020-01-17 00:13:29 -05:00
Razgriz
1c2188128c IP Reputation Checking 2020-01-16 02:56:35 -07:00
Vulpias
4522c15730 :) 
:)
 2020-01-16 04:13:11 +01:00
Vulpias
336434b687 Fixing Spelling errors 
Fixed an error
 2020-01-16 03:51:34 +01:00
Vulpias
e757b64fa6 Egglaying Rework 
Reworked the trait.
you can now choose to make an egg
which costs 150 nutrition (duh you need to make an shell etc.)
-capped the max eggs you can carry at 5 smalls eggs.
-you need to wait 30 seconds to make or lay an egg,
-1 min timeout so you cant spam the ability
 2020-01-16 03:49:11 +01:00
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00
Ketrai
b3de238a35 fex 2020-01-15 23:09:48 +01:00
Kazzc
ce80cc4c3e Changed "usr" << to "to_chat(usr, )" 2020-01-15 03:07:07 -06:00
Rykka
ad7870d904 Correcting an error in syntax 2020-01-15 01:28:30 -07:00
Rykka
3eed9167ef Update Trait names and var names to be more clear. 2020-01-15 01:16:53 -07:00
Rykka
054f493f4b Update to clarify what Cold-Blooded did, renamed to Extreme Cold Pref 2020-01-15 01:06:34 -07:00
Rykka
1dfa822cc1 Revert the changes to neutral.dm 2020-01-15 01:04:14 -07:00
Razgriz
eb01c34eaf Merge pull request #151 from TheFurryFeline/TFF-Unit_Test_Fixy_Test 
Squish Runtime Bugs
 2020-01-14 17:30:39 -07:00
Razgriz
14a4d8e7a7 Merge pull request #150 from TheFurryFeline/patch-8 
Revert Changes
 2020-01-14 17:28:50 -07:00
Razgriz
42a0eb5cbe Merge pull request #137 from Vulpias/master 
Readding Traits, plus 1 new
 2020-01-14 17:19:42 -07:00
Razgriz
4be86bee49 Merge pull request #142 from CHOMPStation2/Razgriz1032-patch-18 
Groin to mouth marking
 2020-01-14 17:04:56 -07:00
TheFurryFeline
816a49145c Appease Travis 2020-01-14 17:29:23 -05:00
Kazzc
e3ce286ea4 Committed out the old "request Spice" from Virgo and made a new command for "request spice" 
It should send a ding noise, comes with commands that allows an admin to "jump, give cookie, Look at VV, look at Player panel, DM them"
 2020-01-14 14:40:21 -06:00
TheFurryFeline
3742f242d8 Revert Changes 
Title.

Changelog Notes:

- Revert changes to Rouge Drone event output regarding what's where.
 2020-01-14 10:55:59 -05:00
Razgriz
d5413574b4 Groin to Snout marking 2020-01-13 20:47:21 -07:00
Vulpias
f7266ef9e4 For Raz 
changes for raz to the traits.dm
making a new extra file
 2020-01-14 04:44:20 +01: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
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
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
Vulpias
3b733f41f9 1 
1
 2020-01-13 21:36:00 +01: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