cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 9 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

1073 Commits

Author SHA1 Message Date
izac112
663f2cfa81 Start of Zara Venlee and marking of a few Defunct people 2019-09-17 23:50:32 +02:00
Hawk-v3
a4079b4b8a Merge branch 'master' into izac 2019-09-17 20:48:41 +01:00
Cebutris
61cc46d6d9 delete-khi-again 2019-09-17 12:16:21 -04:00
izac112
2f071e3130 Everybody - captmatt4, fluff Payton Joghs 2019-09-17 06:39:03 +02:00
izac112
c02c3c0f14 BlackAngelsAce, fluff Aurora Goldtail and Strix Hades. 
this is all of ace's fluff.
 2019-09-17 06:22:42 +02:00
Heroman3003
6e989be5b7 Adds proper tech levels to ML3M and its magazines 2019-09-17 12:04:31 +10:00
Heroman3003
ebe667c4d2 Adds combat hybrid cell-loaded gun kit 2019-09-17 11:53:13 +10:00
Heroman3003
cedb2ddcf9 Adds extra stun cell to HoS kit 2019-09-17 11:29:40 +10:00
Heroman3003
caf274951c Implements ML-3M, Adds prototype NSFW 2019-09-17 11:24:58 +10:00
Heroman
cfb53d3c46 Refactors and rebalances NSFW and ML3M stuff 2019-09-17 07:12:26 +10:00
Hawk-v3
b7a433f914 Merge branch 'master' into space-fox-genocide 2019-09-16 02:34:22 +01:00
Cebutris
6db6d6f0c7 deletes more KHI, reworks some wording and other corps 2019-09-14 15:13:11 -04:00
Cebutris
fd8d450258 more KHI delete 2019-09-14 13:34:23 -04:00
Cebutris
23a8a98909 delete mispelling 2019-09-14 13:31:38 -04:00
Cebutris
4346225077 delete more khi 2019-09-14 13:30:32 -04:00
Cebutris
14d6527103 delete KHI 2019-09-14 13:17:20 -04:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Novacat
6536770991 Merge pull request #5837 from Novacat/nova-ert 
Centcom Tweaks
 2019-09-13 21:34:33 -04:00
Unknown
ccbcdf55c0 Another all access ID removed 2019-09-13 20:34:56 -04:00
Mewchild
e77a66dcc3 Refactors Fluff Items, moves them to be loadout options 2019-09-10 04:59:10 -05:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
Repede
3b51532819 Merge branch 'master' into master 2019-09-08 14:57:35 -04:00
Hawk_v3
fc97b8233b Merge remote-tracking branch 'upstream/master' 2019-09-08 18:55:37 +01:00
DameonOwen
325fdd7e87 Adds the mysterious cookie fluff item. 2019-09-04 22:18:15 -04:00
Cyantime
eac30eb7e1 Gives Burrito their uniform back 2019-09-01 19:18:14 -04:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Novacat
5eaebcf0df Merge pull request #5757 from Rykka-Stormheart/shep-dev-phaser-buff 
Buff Frontier Phasers by reducing charge time to sub-30 seconds.
 2019-08-31 17:21:08 -04:00
Novacat
ca6c795661 Update custom_guns_vr.dm 2019-08-31 17:07:30 -04:00
Rykka
ae2086b288 Updates as per review. 2019-08-31 15:01:00 -06:00
Rykka
a51070d192 Fix var/phase_power defined twice 2019-08-31 14:34:00 -06:00
Rykka
86a4b20a36 Updated values as per Novacat's Review 2019-08-31 14:31:18 -06:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Rykka
1ac0fd8648 Reduces Phaser Charge Time to sub-30 seconds 2019-08-31 12:58:19 -06:00
Novacat
1f547beef5 Merge pull request #5731 from Novacat/nova-heterochromia 
Buffs Mini Translocator
 2019-08-31 01:37:40 -04:00
Hawk_v3
b6ebecf7ec Merge remote-tracking branch 'upstream/master' 2019-08-30 21:38:17 +01:00
Unknown
1607c10755 Suggested Changes 2019-08-29 04:04:32 -04:00
Unknown
9390884ca7 Buffs Mini Translocator 
- Removes Z level restriction on mini translocator
- Decreases charge cost of mini translocator from 2400 to 480
- Mini Translocator starts with a device cell instead of a weapon cell
- Removes illegal tech level from Mini translocators

The overall effect is that mini translocators still start off with one charge and one beacon, but can now be used across z levels. Mini translocators can also be equipped with a weapon cell that gives them five charges instead of one.
 2019-08-29 00:20:02 -04:00
Unknown
20d87447a9 Removes HoS Voidsuit Stats 2019-08-28 01:24:48 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
CRTXBacon
1b368e978d Update custom_items_vr.dm 2019-08-20 00:11:26 +01:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
chaoko99
151043ad85 Fixes Chaoko99's custom item. 2019-08-13 19:06:29 -07:00
izac112
0980775d93 Vasharr fluff #2 2019-08-14 02:03:17 +02:00
izac112
e2570c5585 Vasharr fluff 2019-08-14 01:34:06 +02:00
izac112
a3037eb703 Fluff cleanup 'Generalpantsu' 2019-08-14 01:08:04 +02:00
izac112
2734fe7a65 Cleaning up fluff 'Deathty' 2019-08-14 01:05:00 +02:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
if there were two guys on the moon
62b14805d5 adds ml3m to closets and stuff 2019-07-27 16:16:10 +01:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
if there were two guys on the moon
163ac56503 sprites and map fix 2019-07-22 23:20:00 +01:00