cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,223 Commits 6 Branches 0 Tags
08156ced8c50351bc25a4031aa617ad2187128e6
Commit Graph

1978 Commits

Author SHA1 Message Date
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
Casey
7e8140b368 Merge pull request #14117 from Screemonster/shinealight 
Makes the unmaintained antique behave like one
 2022-11-21 01:34:16 +00:00
Razgriz
2b204b9194 Port old point defense stuff I rage-closed 
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
 2022-10-02 21:39:21 -07:00
Razgriz
042366372e Merge pull request #5018 from CHOMPStation2/I-Will-Give-You-500-Dollars-to-fuck-off-conflicts 
[Manual MIRROR] Adds a ton more altevian stuff
 2022-09-22 22:24:16 -07:00
Razgriz
4b24086042 powder that makes you say yes 2022-09-22 21:55:43 -07:00
Razgriz
6bbcda4901 [Manual MIRROR] Adds a ton more altevian stuff 
Ports https://github.com/VOREStation/VOREStation/pull/13774 instead of the auto mirror because github was crying over conflicts with a .dmi file
 2022-09-22 21:32:28 -07:00
Novacat
06014fb014 Removes last references to simple_animal 2022-09-10 20:54:36 +00:00
Razgriz
36ec46103e powder that makes you say yes 2022-08-17 01:27:20 -07:00
Casey
6869732e32 adds cool and fun and totally balanced new weapon 2022-08-07 19:35:59 +00:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00:00
Victor Zisthus
245591be95 Shuttle/Voidcraft Hotfix 
Updates Shuttlecraft and Voidcraft to be visible by bullet penetration code. Things designed to fly in space at high speeds with lots of little rocks present are not gonna feel bullets all that much.
 2022-07-03 23:06:28 -04:00
Bib Bob
90fc75333c powder that makes you say yes? 2022-06-29 19:25:45 -05:00
Nadyr
a1a074cd80 powder that makes you say yes 2022-06-29 20:11:36 -04:00
Nadyr
7f856931e0 powder that makes you say yes 2022-06-29 19:13:55 -04:00