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
76,334 Commits 5 Branches 0 Tags
366394689888bcf0c2dee1286b30993d610129fc
Commit Graph

1923 Commits

Author SHA1 Message Date
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
TheGreatKitsune
8384f27582 Allow click-dragging things into rechargers (#6749) 2023-08-08 08:01:05 +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
e737cb1fc5 Damage reduction, new sound effects 2023-07-12 10:15:40 +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
1cffb3f0e7 Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds 
Sound Additions + Tweaks
 2023-06-18 16:27:37 +02:00
Digi Purpur
47d6a439f1 All the changes required for coilgun FXs to work 
Changes object/effects from "pointdefense" to "coildefense" to use when you prefer "projectile" PD turrets (point defense turrets vars and such should just use the old laser effects for cases where we wanna use those instead of the new ones Rykka and I added here!)
 2023-06-17 09:04:05 -07: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
Heroman3003
5738a980d4 Merge pull request #14926 from Youtubeboy139/Grammar1 
Some Grammar Fixes
 2023-05-31 02:14:24 +00: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
Nadyr
2466d8cdba Merge pull request #6137 from CHOMPStation2/upstream-merge-14812 
[MIRROR] Ion Beam Redux
 2023-04-25 22:15:41 -04:00
Nadyr
d7e6bacafd powder that makes you say yes 2023-04-25 21:44:57 -04:00
Heroman3003
1ddb447c1b Merge pull request #14814 from KillianKirilenko/kk-shottedgun 
Shotgun Tweak
 2023-04-23 20:51:38 +00:00
Heroman3003
317fc95a7e Ion Beam Redux 2023-04-22 05:41:47 +00:00
Nadyr
26354a48fd Merge pull request #5961 from BlackMajor/master 
Nerfs submachine gun. Cuts the damage by 1/3
 2023-03-17 04:07:13 -04:00
BlackMajor
6057d2ee1f Update bullets_ch.dm 2023-03-17 16:28:18 +13:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Heroman3003
a4a7079374 Merge pull request #14610 from VOREStation/upstream-merge-8997 
[MIRROR] Projectiles properly set starting var.
 2023-03-09 05:16:57 +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
Razgriz
af42aaa152 Merge pull request #5796 from Seris02/gunsprites2 
gun sprite chomp check
 2023-03-04 16:25:54 -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
d6f084007d Update energy.dm 
Comment old parts of energy.dm that have been moved.
 2023-03-01 08:56:21 -08:00
Cyrelius
1eb0b03a8e Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-03-01 08:53:21 -08:00