cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 10:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 12 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

8834 Commits

Author SHA1 Message Date
TheFurryFeline
947af62326 Whitelist Fix Revamp 
Should work now to prevent you from spawning in as a vox/diona/xenochimera unless you got a whitelist.

Changelog Notes:

- Require whitelist for Vox, Xenochimera, and Diona. Fixes oversights from https://github.com/CHOMPStation2/CHOMPStation2/pull/114
 2020-01-20 15:42:39 -05:00
Rykka
5b3c8dc06c Remove the init_vore line that was spamming runtimes. 2020-01-20 00:29:10 -07:00
Razgriz
fd4f6a6eb0 Merge pull request #155 from Rykka-Stormheart/shep-dev-YEEN-GANG 
Add hyenas, and a custom pack_mob ai type for them
 2020-01-17 23:47:25 -07:00
Rykka
fc8e61511f Test fixes 2020-01-17 15:35:00 -07:00
Rykka
e0eb477cdd Add vore settings/info, and add non-hostile AI for Nyria 2020-01-17 15:28:41 -07:00
Rykka
107858c4c7 Update hyena icons, increase vision range and set mauling on. 2020-01-17 04:39:36 -07:00
Rykka
43c839a4ba Adds hyena icons and updates file to use them! Balance testing next! 2020-01-17 03:19:20 -07:00
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
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
Rykka
fedc66aab8 Add a missing slash that made Travis think it was a var 2020-01-15 15:46:37 -07:00
Rykka
dbdbc41a67 Fix indentation. Fucking VS Code. Thanks Ex <3 2020-01-15 15:41:10 -07:00
Rykka
c2ed525688 Updates to appease Travis <3 2020-01-15 14:10:42 -07:00
Rykka
ff1328e80e Test Indentation/Travis Fix 2020-01-15 05:35:33 -07:00
Rykka
cb97713a09 Add hyenas, and a custom pack_mob ai type for them 
The AI type will be further iterated on later.
Hyena icons patiently awaiting sprite art. <3
 2020-01-15 05:02:09 -07: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
42a0eb5cbe Merge pull request #137 from Vulpias/master 
Readding Traits, plus 1 new
 2020-01-14 17:19:42 -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
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -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
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
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
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Razgriz
fc29f80132 Merge pull request #121 from CHOMPStation2/Sharkmare-🥚 
🥚
 2020-01-12 21:40:47 -07:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Sharkmare
9c205d085c DME 2020-01-12 23:43:09 +01:00
Vulpias
2c1414f1ab try 2 
changed files,
made a new one
added new traits
 2020-01-12 23:28:59 +01:00
Vulpias
e6e0f3eee6 Add new traits 
Added 1 old trait

and added one new trait which was requested, its  a wip and will be changed, now its only a placeholder which can already be used.
 2020-01-12 22:45:06 +01:00
Sharkmare
8653f939b3 Rideable borgs 2020-01-12 22:35:19 +01:00
Heroman
de03c4e3e3 Adds a timegate on playing maintenance drones 2020-01-13 06:19:10 +10:00
Repede
17d336009e Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:57:03 -05:00
Repede
e671d2d799 Merge branch 'master' into Howl'n 2020-01-12 14:36:47 -05:00
Repede
2d453d354b Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:36:25 -05:00
RadiantFlash7
cda5c1e3e3 YW comment eddits 
Proper commenting.
 2020-01-12 12:08:08 -05:00
Holdelta
b24d324ad9 Update station_vr.dm 2020-01-11 23:38:00 -08:00
Holdelta
2bcd08a098 Update station.dm 2020-01-11 23:37:06 -08:00
RadiantFlash7
7de718e369 Revert "Revert "2.21"" 
This reverts commit d3885d57f4.
 2020-01-12 01:20:36 -05:00
RadiantFlash7
6362eac935 Revert "Revert "2.2"" 
This reverts commit d71cb2b6e2.
 2020-01-12 01:20:03 -05:00
RadiantFlash7
15993154b7 Revert "Revert "Fixes shuttle space tiles+mobtemp"" 
This reverts commit 719d42cbb4.
 2020-01-12 01:19:55 -05:00