cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-08 07:43:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 9 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

37118 Commits

Author SHA1 Message Date
Rykka fab4ecff1d Found the issue thanks to Heroman 2020-01-27 01:31:42 -07:00
Razgriz 9c5a4e3575 Merge pull request #185 from lbnesquik/Sledgehammer-Add 
Add a craftable, two-handed sledgehammer.
 2020-01-24 03:03:02 -07:00
Razgriz 768860ca0a Merge pull request #182 from InsanityKitten/InsanityCat-Scarab 
New construable mecha + general mecha fixes!
 2020-01-21 23:57:31 -07:00
Razgriz bcc151be94 Merge pull request #181 from Somememeguy/soda_metabolism 
Makes it so Soda Metabolizes Faster (When Ingested)
 2020-01-21 12:19:50 -07:00
Razgriz 57fb53bf52 Merge pull request #184 from Rykka-Stormheart/shep-dev-suit-protection 
Suit Cyclers Apply Proper Suit Stats
 2020-01-21 12:18:38 -07:00
TheFurryFeline e633357ad3 Fix Autotransfer 
Changelog Notes:

- Revert the removal of automatically called transfers if no players are in round.
 2020-01-21 10:50:52 -05:00
lbnesquik e0fcf47373 Add a craftable, two-handed sledgehammer. 
- Can be made out of plasteel, rods and metal.
- Relatively high damage but less than the fireaxe.
- Special sound.
 2020-01-21 13:48:28 +01:00
Rykka 9118c62ad2 Suit Cyclers Apply Proper Suit Stats 
Resolves #143
Port of https://github.com/CHOMPstation/CHOMPstation/pull/695
 2020-01-21 04:39:52 -07:00
Aaron 2d113d3b4a adds scarab salvage chance 
I meant to do this! my bad!
 2020-01-20 20:39:14 -05:00
Aaron ff94875b02 New mech and mech fixes! 
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
 2020-01-20 19:51:44 -05:00
Aaron ff9ec4943b New Mech "Scarab"! Plus a bunch of mech fixes 
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
 2020-01-20 19:51:24 -05:00
Matica 52c9802c1f Makes it so soda metabolizes faster 
Soda metabolizes faster as, with it's current speed, it isn't doing anything.
 2020-01-20 17:00:23 -05:00
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
ExabyteDiscord 9aaaa44ace Merge pull request #170 from InsanityKitten/InsanityCat-MechPhoronBore 
Mech Mounted Phoron Bore + BL-3 fix
 2020-01-18 18:04:24 -08:00
Aaron 313c16aef0 fixes typo, moves art into seperate _ch files. Ignore scarab 
Title.
 2020-01-18 14:15:31 -05: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
Aaron cf82e2cae5 adds desired changes 
self explaintory
 2020-01-17 21:39:36 -05: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
Aaron c1f760883a Mech Mounted Phoron Bore + BL-3 fix 
Adds a phoron bore to be mounted onto mechs and fixes the model of the mecha medigun not showing up properly.
 2020-01-17 16:47:18 -05: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
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
Razgriz 6970b05bf2 Merge pull request #158 from InsanityKitten/MicroMechFix 
Micro Mech slot fix
 2020-01-16 23:53:04 -07:00
Razgriz 5350aec7b2 Merge pull request #166 from CHOMPStation2/Darlantanis-ExplorationCarrier 
The Exploration Carrier
 2020-01-16 23:46:18 -07:00
Razgriz 123a73e593 Merge pull request #167 from TheFurryFeline/patch-9 
One hour each vote, ya dork
 2020-01-16 23:45:49 -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
TheFurryFeline 8b3f923022 One hour each vote, ya dork 
Changelog Notes: 

- Mirrors https://github.com/CHOMPStation2/CHOMPStation2/commit/8635c10cb7ec99f098ac49d176f6f0b0ecc5c8b1#diff-4c8c96ffe84f42601f70e27064063cd0
 2020-01-16 23:10:26 -05:00
Nadyr 129173f85f Changes sound.dm to add exploration carrier ambience 2020-01-16 17:04:40 -05:00
Razgriz 1c2188128c IP Reputation Checking 2020-01-16 02:56:35 -07:00
Razgriz c9b4ad7a83 IP Reputation Checking 2020-01-16 02:55:45 -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
Aaron f483c5bda5 Micro Mech slot fix 
This shows micro mech slots in the equipment area and allows for them to be properly disconnected
 2020-01-15 19:09:27 -05:00
Rykka 2214003ff2 Forgot the GLOB. 2020-01-15 16:49:05 -07: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
Ketrai b3de238a35 fex 2020-01-15 23:09:48 +01: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
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