cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,537 Commits 10 Branches 0 Tags
e1a987c25ca81ccff8b206fe02b278dae4cdccdd
Commit Graph

1134 Commits

Author SHA1 Message Date
Raeschen
2e48d9419b Revert magazine sizes in combat refactor (#8033) 2024-03-23 10:28:34 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Selis
ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
Missile597
1f904af89a Laser4 Fix (#7645) 
Co-authored-by: Changelogs <action@github.com>
 2024-01-28 21:30:09 -05:00
Kashargul
c820b6f0e5 donking (#7571) 2024-01-17 22:02:40 -05:00
CHOMPStation2
6548bcd55c [MIRROR] Gives Altevian Slicer a better sound (#7555) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-14 18:32:26 -05:00
CHOMPStation2
4ea69d7301 [MIRROR] Adds altevian mineral slicer (#7521) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-07 18:26:42 -05:00
Aroliacue
8dc3f411a2 Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336) 2023-12-06 21:31:18 +01:00
CHOMPStation2
4667401397 [MIRROR] Redgate Laserdome (#7319) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-03 12:54:20 +01:00
Aroliacue
aaff33e980 Curabitur Improvements, Belly Liquid Reagent Additions (#7284) 2023-11-29 16:23:04 +01:00
FluffMedic
08e7b6658b 1 real fix, two bandaid ones. (#7270) 2023-11-25 13:53:46 +01:00
Selis
aae9676187 [MIRROR-FIX] Upstream merge 15493 (#7178) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-11-07 13:34:51 +01:00
tacoguy7765093
c262e908b9 bandaid fixes some invisible guns (#7077) 2023-10-04 21:40:59 -04:00
CHOMPStation2
3663946898 [MIRROR] Altevian Adjustments - Descriptions & Small Tweaks (#7072) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:58:54 -04:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
CHOMPStation2
86fed82d17 [MIRROR] Remove all mention of nazis from code (#7000) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-18 18:07:17 +02:00
CHOMPStation2
dc189c0b16 [MIRROR] Killian's Grab Bag PR (#6880) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-29 17:30:20 +02:00
CHOMPStation2
ec735809c5 [MIRROR] A bunch of small fixes (#6820) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-16 09:46:36 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +02:00
Aroliacue
7368ed0071 [READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
 2023-07-31 15:00:03 +02:00
Aroliacue
690596cbf8 C-20R rework, new wielded gun sprites 2023-07-14 17:33:51 +10:00
Aroliacue
efcaab7427 Merge branch 'master' into aro_firearms 2023-07-12 10:23:17 +10:00
Aroliacue
7b6cdfbdf4 More inaccuracy, movement delay removal 2023-07-12 10:14:12 +10:00
Aroliacue
31bb617dc9 P90K Revamp 2023-07-12 07:39:22 +10:00
Raeschen
cfcbc4c3be tommylaser 2023-07-11 19:13:47 +02:00
Raeschen
83d3648d3d some name reversions 2023-07-11 18:55:18 +02:00
Raeschen
48c212a367 laser_vr replaced with pump, replaced with pump_ch 2023-07-11 18:13:40 +02:00
Raeschen
07face4da4 push rebase updates into pump_ch 2023-07-11 18:11:55 +02:00
Raeschen
219b8663b1 pump_ch 2023-07-11 18:10:16 +02:00
Raeschen
709308d2c3 manual check of all files 2023-07-11 18:10:13 +02:00
Nadyr
0ed727001f powder that makes you say yes 2023-07-11 18:10:07 +02:00
Nadyr
e5b27da80c powder that makes you say yes 2023-07-11 18:10:06 +02:00
Nadyr
2754b0cf08 powder that makes you say yes 2023-07-11 18:10:04 +02:00
Nadyr
090b24cb3d powder that makes you say yes 2023-07-11 18:10:02 +02:00
Nadyr
1a7983f8cf powder that makes you say yes 
Rebase to master
 2023-07-11 18:10:01 +02:00
Casey
8c6de9128a Firearms 2 
Rebase to master
 2023-07-11 18:09:13 +02:00
Raeschen
e048b3a314 Fixes several missing texture objects 2023-06-25 15:38:45 +02:00
Razgriz
4aaf01a5bb Merge pull request #5714 from Cyrelius/Weapons/Armour 
Energy Weapons Balance Pass.
 2023-06-23 23:44:04 -07:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Heroman3003
bcd039779a Merge pull request #15026 from Enzo-Leon/weapons-tune 
Re-adjusts Altevian Weapons
 2023-06-15 23:11:17 +00:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Cyrelius
08013d2cca Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-06-02 09:56:38 -07:00
Nadyr
809256323e powder that makes you say yes 2023-05-29 18:53:42 -04:00
Heroman3003
8826718f1c Gun Reloading Microtweaks 2023-05-27 03:30:22 +00:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Razgriz
2afa319f09 Merge pull request #5842 from Rykka-Stormheart/shep-dev-ear-ringing 
Adds Deafened Feedback, enhances looping sounds further
 2023-03-04 16:37:29 -07:00
Rykka Stormheart
640a73cb06 Adds Deafened Feedback, enhances looping sounds further 
Adds deafened ear ring that plays any time you're deafened, and fades back in once you can hear again.

Example of deafened feedback [here](https://streamable.com/8s8vlu). 

Worry not, if you're deafened via mutation or other, you'll simply go deaf, and only hear the fade-in once you regain hearing. 

It will also only play **once** when you are deafened. Further deafening effects while you are already deaf will not force you to hear it again.
 2023-03-03 04:08:08 -08:00
Cyrelius
3693fcae82 Update laser.dm 
Reducing Size of Laser rifle and Xray laser to large, and removing the battery lock on the laser cannon, as it's largely worthless in PVE with it.  It should get a cost/tech increase though, as it's actually a good weapon now.
 2023-02-28 19:27:45 -08:00