cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

16482 Commits

Author SHA1 Message Date
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
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
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
Aaron
cf82e2cae5 adds desired changes 
self explaintory
 2020-01-17 21:39:36 -05: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
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
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
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
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +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
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
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10: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
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
Novacat
4068f95211 Merge pull request #6435 from Heroman3003/dronelimit 
Increases timegate for cyborgs to 3 days
 2020-01-12 17:20:29 -05:00
Heroman
eee8ecd2e5 Increases timegate for cyborgs to 3 2020-01-13 08:04:18 +10:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
Repede
2d453d354b Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:36:25 -05:00
Holdelta
6b83f6010e Update RPD.dm 2020-01-12 00:35:04 -08:00
RadiantFlash7
847edc50cc misc map fixes. vending 
Adds the changes to YW vendor, and fixes to maps.
 2020-01-12 02:56:42 -05:00
RadiantFlash7
0be2f5c98e Revert "Vending machine changes+Warehouse fix" 
This reverts commit 8779e1b1d4.
 2020-01-12 02:46:18 -05:00
RadiantFlash7
8779e1b1d4 Vending machine changes+Warehouse fix 
Fixes cargo warehouse,
Applies new vending machine changes.
 2020-01-12 02:38:32 -05:00
Holdelta
a306d5fd4e Update engineering.dm 2020-01-11 23:34:21 -08:00
Holdelta
0624435524 Update engineering.dm 2020-01-11 23:32:56 -08:00
Holdelta
971926f195 Add files via upload 2020-01-11 23:29:43 -08:00
Holdelta
0584609047 Add files via upload 2020-01-11 23:28:37 -08:00
RadiantFlash7
8bbb074c08 I give up. 
Resets this file to default, because fuck everything apparently.
 2020-01-12 02:15:59 -05:00
RadiantFlash7
3338068d32 2.28 
Travis, My tears are full of salt.
Please accept them as an offering.
 2020-01-12 01:35:51 -05:00
RadiantFlash7
82937c85f4 2.whatever 
The only other thing I touched was this.
Surely that means it's this thats breaking it?
 2020-01-12 01:29:31 -05:00
RadiantFlash7
f749ac9d4c Revert "Revert "2.24"" 
This reverts commit 9e88c4f613.
 2020-01-12 01:20:47 -05:00
RadiantFlash7
239aff92fa Revert "Revert "fixing indentation error"" 
This reverts commit 0efe43dc44.
 2020-01-12 01:20:43 -05:00
RadiantFlash7
8b12d15cf3 Revert "Revert "2.22"" 
This reverts commit 484e80f9c8.
 2020-01-12 01:20:41 -05:00
RadiantFlash7
faf6e95ce3 Revert "Revert "Major map change+misc changes"" 
This reverts commit f0d4f38bf1.
 2020-01-12 01:19:47 -05:00
RadiantFlash7
f0d4f38bf1 Revert "Major map change+misc changes" 
This reverts commit fd22b5ca87.
 2020-01-12 01:16:31 -05:00
RadiantFlash7
484e80f9c8 Revert "2.22" 
This reverts commit e74d277ce5.
 2020-01-12 01:15:56 -05:00
RadiantFlash7
0efe43dc44 Revert "fixing indentation error" 
This reverts commit 3b021863b5.
 2020-01-12 01:15:53 -05:00