cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,996 Commits 8 Branches 0 Tags
3995338290d8b69edb786c331e335d6d33838905
Commit Graph

1942 Commits

Author SHA1 Message Date
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
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
Casey
beb3423544 Merge pull request #14575 from Screemonster/mineminemine 
Makes mining drones have a smarter IFF
 2023-02-27 18:58:23 +00:00
Seris02
2200cd9c10 almost made a big woops there weh 2023-02-26 12:38:24 +08:00
Seris02
246faa3c67 gun sprite chomp check 2023-02-26 10:21:42 +08:00
BlackMajor
7d72ebeb73 Don't spam admins please 2023-02-25 14:54:19 +13:00
BlackMajor
ef046afc8d Don't spam admin logs please 2023-02-25 14:52:23 +13:00
Cyrelius
b006405262 Update energy_ch.dm 
Moving Phase weapon changes here.
Giving phase weapons -armour penetration in a similar manner as hollow point bullets to make armour better against them.
 2023-02-24 17:14:11 -08:00
Cyrelius
d84a5a833c Update laser_vr.dm 
Changing the fire mode order on the phaser rifle in hopes that it works around a fire rate bug that made the sniper mode abusable.
Mildly reduces cost of phaser rifle lethal mode.
 2023-02-22 00:03:34 -08:00
Cyrelius
040ccf33e9 Update phase.dm 
On further consideration, 100 was probably too much of a charge cost for the hell they're going into.
 2023-02-13 18:03:18 -08:00
Cyrelius
18554db4e7 Update laser_vr.dm 
Ooops, messed up size on that too.
 2023-02-13 16:52:38 -08:00
Cyrelius
93dcaf98d7 Update code/modules/projectiles/guns/energy/laser_vr.dm 
Fixing missing comma.

Co-authored-by: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com>
 2023-02-13 16:50:38 -08:00
Cyrelius
bb2abab20f Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-02-12 21:28:18 -08:00
Cyrelius
152582a17e Update phase.dm 
Reverting changes on this branch, as it shouldn't have them.
 2023-02-11 21:16:16 -08:00
Cyrelius
d3bcf0394d Update phase.dm 
Moving phase weapon changes to this branch.  Making charge cost even across the board to 100 to balance them.
 2023-02-11 21:15:01 -08:00
Cyrelius
36e5f3ba9f Merge branch 'CHOMPStation2:master' into Weapons/Armour 2023-02-11 21:11:47 -08:00
Cyrelius
204a328868 Merge branch 'CHOMPStation2:master' into items 2023-02-08 22:50:13 -08:00
Cyrelius
9d89007d9a Update laser_vr.dm 
Adjusted Phasers in hopes of making them vaguely useful after the changes.  The charging mechanic is still weaker than it was originally, but now is no longer *completely* useless, just very slow.
 2023-02-05 01:27:55 -08:00
Cyrelius
b5d1414976 Update beams_ch.dm 
Adjusted phaser damage, now no longer do bonus damage to humanoid simple mobs.  In exchange, they've been buffed a bit.
 2023-02-04 20:51:19 -08:00
Heroman3003
077834dd5c [MIRROR] Tiny grammar tweaks 2023-01-30 08:51:26 +00:00
Nadyr
914f627dc0 Merge pull request #5587 from CHOMPStation2/upstream-merge-14354 
[MIRROR] Event Stuff Bugfix/Balance Pass
 2023-01-27 10:17:52 -05:00
BlackMajor
353f4e1cab Merge branch 'master' into upstream-merge-14247 2023-01-25 14:01:30 +13:00
Cyrelius
ad04ddd57a Merge branch 'CHOMPStation2:master' into items 2023-01-22 18:27:58 -08:00
Cyrelius
ba133b2db0 Update phase.dm 
Reduced phase weapon charge cost across the board.
 2023-01-22 18:27:37 -08:00
Cyrelius
1c447bd7af Update energy.dm 
Discussion with Raz, increased range on phase weapons.
 2023-01-22 17:05:11 -08:00
Heroman3003
222ec534c8 Event Stuff Bugfix/Balance Pass 2023-01-22 01:33:56 +00:00
Razgriz
f4bfecb4e3 Nerf charging time of all frontier phasers 
-Nerfed charge time of all phasers by dividing phase_power by 8
 2023-01-20 18:18:29 -07:00
Razgriz
91d35cbf42 5.7 boolets 2023-01-19 14:17:31 -07:00
Razgriz
df94dd05f6 Add files via upload 2023-01-19 13:57:27 -07:00
Heroman3003
e9c2487299 Merge pull request #14290 from VOREStation/upstream-merge-8851 
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
 2023-01-04 02:56:23 +00:00
Casey
754c0af3c3 Gives pilots their holdout back 2022-12-26 02:11:48 +00:00
Nadyr
333ee6f107 powder that makes you say yes 2022-11-21 23:13:50 -05:00