cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,785 Commits 5 Branches 0 Tags
5fe59a1f2a1a56a8b83ababdaf4fb36770105f94
Commit Graph

21630 Commits

Author SHA1 Message Date
Arokha Sieyes
5fe59a1f2a Critical maploader fix 
Definitely do not update the server without this change.
And a gateway tweak thing because that was my original intent with this branch.
 2018-10-13 01:36:26 -04:00
Aronai Sieyes
5f10bf5444 Merge pull request #4352 from Screemonster/prommiecoreicons 
gives prommie cores an icon
 2018-10-12 21:35:00 -04:00
Spades
4bea97df74 Merge pull request #4360 from lbnesquik/Kates-Flight-Tweak 
Adjust winged flight cost and description.
 2018-10-12 19:21:36 -04:00
Spades
85bcb03327 Merge pull request #4361 from lbnesquik/Kates-Catgirl-Tweak 
Makes it so standard catgirls can appear.
 2018-10-12 19:18:52 -04:00
Spades
561f196591 Merge pull request #4336 from Screemonster/pouncechanges 
Gives pounces a chance to fail
 2018-10-12 19:18:29 -04:00
Screemonster
f513ca75bb use the proper proc for this thing 2018-10-12 15:34:02 +01:00
lbnesquik
7bde126b8c Fixes weird typos. 2018-10-12 15:49:27 +02:00
lbnesquik
941896a165 Makes it so standard catgirls can appear. 2018-10-12 12:34:30 +02:00
lbnesquik
95445d808d Reduce Flight cost 2018-10-12 12:24:30 +02:00
Spades
6f48c01382 Merge pull request #4333 from kcin2001/fixes 
fixes copy paste error
 2018-10-12 06:00:28 -04:00
Aronai Sieyes
f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats 
Log trait and species usage for metrics
 2018-10-12 01:45:54 -04:00
Screemonster
7d6731f39e shove this shit in procs 2018-10-12 06:40:17 +01:00
Aronai Sieyes
1faaecb320 Merge pull request #4346 from VOREStation/upstream-merge-5632 
[MIRROR] Remplace sprite hammer with pickaxe
 2018-10-12 01:12:44 -04:00
Aronai Sieyes
a84074572a Merge pull request #4338 from Screemonster/shadefluffers 
Minor shadekin fixes
 2018-10-11 23:52:18 -04:00
Aronai Sieyes
a5afd37e18 Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix 
Adds nevrean eggs.
 2018-10-11 23:15:12 -04:00
Aronai Sieyes
1ece0b15a8 Merge pull request #4299 from ArgobargSoup/master 
Bug abdomens
 2018-10-11 21:42:54 -04:00
Arokha Sieyes
ea0d6fc5a1 Log trait and species usage for metrics 
Just some stuff for use in building statistics about characters
 2018-10-11 20:49:33 -04:00
Aronai Sieyes
79d590140e Merge pull request #4347 from VOREStation/upstream-merge-5617 
[MIRROR] Admin ticket system (for real this time)
 2018-10-10 21:22:59 -04:00
Arokha Sieyes
164c72267c Vorestation specific tweaks for tickets 2018-10-10 18:17:13 -04:00
Screemonster
5644ee00fd forgot to mark edit 2018-10-10 22:17:20 +01:00
Anewbe
726f01e15e Merge pull request #5646 from lbnesquik/Kates-Tiny-Tweak 
Remove intensity from chemistry machines.
 2018-10-10 16:54:30 -04:00
Screemonster
b34714684a gives prommie cores an icon 2018-10-10 13:48:22 +01:00
Spades
12b0f7fdff Merge pull request #4342 from VOREStation/upstream-merge-5635 
[MIRROR] Fix yes emote not working correctly.
 2018-10-10 05:27:04 -04:00
Spades
ae8b60f0d8 Merge pull request #4341 from VOREStation/upstream-merge-5634 
[MIRROR] Remove kobold.dm
 2018-10-10 05:26:42 -04:00
Spades
5b91c8fccd Merge pull request #4339 from Screemonster/idontgetsickigivesick 
Xenochimera virus tweak
 2018-10-09 17:07:36 -04:00
Spades
6988bfcc44 Merge pull request #4329 from VOREStation/upstream-merge-5638 
[MIRROR] Fixes chem master dumping reagents.
 2018-10-09 17:06:11 -04:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Anewbe
f0db332943 Remplace sprite hammer with pickaxe 2018-10-09 16:28:45 -04:00
Atermonera
6be6f9a957 Merge pull request #5635 from lbnesquik/Kates-Emote-Fix 
Fix yes emote not working correctly.
 2018-10-09 13:48:35 -04:00
Atermonera
6b6f811278 Merge pull request #5634 from lbnesquik/Kates-Kobold-Remov 
Remove kobold.dm
 2018-10-09 13:44:16 -04:00
Screemonster
e3356ed5fe Xenochimera tweak 2018-10-09 14:12:02 +01:00
Screemonster
ebd235ed1e fix pounces for those dirty nonvore types 2018-10-09 13:47:45 +01:00
Screemonster
71f5870b46 Minor shadekin fixes 2018-10-09 13:15:13 +01:00
Screemonster
4faca0b7f8 gives pounces a chance to fail 2018-10-09 11:53:55 +01:00
Spades
ec3fb80f97 Merge pull request #4335 from Novacat/nova-heterochromia 
Rebalances VR Jumpsuits
 2018-10-08 20:48:13 -04:00
Spades
f6ce097810 Merge pull request #4325 from VOREStation/upstream-merge-5639 
[MIRROR] Fixed smes terminal construction requiring more cable than used.
 2018-10-08 20:43:38 -04:00
Unknown
b237af9eab Rebalances VR Jumpsuits 
Virgo-specific jumpsuits (KHI and Star Trek) available in loadout are not supposed to have protection bonuses over the non-virgo ones.
 2018-10-08 17:41:07 -04:00
kcin2001
fb4fcf1e18 fixes copy paste error 2018-10-08 11:58:01 -07:00
Spades
ccc1fa30ec Merge pull request #4313 from Novacat/nova-pathfinder 
Expedition Balance Tweaks
 2018-10-07 18:00:00 -04:00
Spades
311e184fb0 Merge pull request #4311 from lbnesquik/Kates-Hippo-Mob 
Hippo mob + Simple mob sounds
 2018-10-07 17:59:07 -04:00
Spades
189b724c59 Merge pull request #4305 from lbnesquik/Kates-Observe 
Fix misleading alert.
 2018-10-07 17:58:46 -04:00
Spades
8a657ce011 Merge pull request #4177 from Verkister/slowitemgurgles 
Makes item digestion gradual and belly damage based.
 2018-10-07 17:58:02 -04:00
Anewbe
e1e5109c42 Merge pull request #5638 from lbnesquik/Kates-Chemistry-Fix 
Fixes chem master dumping reagents.
 2018-10-07 16:44:17 -04:00
Anewbe
9a4a01a8bb Merge pull request #5639 from Heroman3003/smes-fix 
Fixed smes terminal construction requiring more cable than used.
 2018-10-06 16:04:40 -04:00
Spades
8c2e0928fa Merge pull request #4130 from KasparoVy/fix-tesh-hide-again 
Fix Teshari Hiding Again
 2018-10-06 08:25:35 -04:00
lbnesquik
986dc248b0 Adds nevrean eggs. 2018-10-06 10:06:28 +02:00
Kates
06f01d9e58 Update new_player.dm 2018-10-06 03:27:58 +02:00
Unknown
5d7a974679 Reverts Phaser Nerf 2018-10-05 16:56:16 -04:00
Unknown
af4afc3e32 Fixes bug with holdout phasers 2018-10-05 02:04:30 -04:00
Unknown
e20f05e188 Expedition Balance Tweaks 
- Removes hostile mobs from V4 Beach
- Adds Giant Snakes and Giant spiders in generic V4 Cave spawners
- Reduced respawn rates to cut down on incidences of 'deathclaw swarms'
- Giant Snakes and Deathclaws have reduced overall spawn rates, Giant Spiders and Frogs will generally be more common.
- Replaced Ion hivebots with Ion Spiders
- Reduced expedition phaser to 5 shots
 2018-10-04 21:55:27 -04:00