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
75,141 Commits 8 Branches 0 Tags
db38ed93c0d04d1d218669779e0a034daf872d01
Commit Graph

1699 Commits

Author SHA1 Message Date
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
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Rykka Stormheart
1de51fb4b8 Sound Additions + Tweaks 
Changes listed below:
* Makes Death Sounds mutable on their own audio channel.
* Makes Ear Ringing use the HUD Channel for sounds

Additions:
* [Adds On Fire effect](https://streamable.com/c1fxeo)
* Adds Stunned effect(https://streamable.com/v2if0s)
* [Adds SMES humming based on power usage in/out. Affected by walls, will only play if in LOS and visible.](https://streamable.com/z41x90)
* [Adds Atmos Alerts making a noise on the monitor](https://streamable.com/uhegq6)
* [Tcomms + PDA servers hum when powered and active, also respects walls/LOS](https://streamable.com/vb08x1)
* [Fridges hum quietly while powered](https://streamable.com/c3zsz7)
* [Point Defense turrets now make a sound audible from inside the station when firing, to add more spice to meteor waves.](https://streamable.com/bf8mwl)
* Shield Generators now hum when active.
 2023-06-15 12:27:23 -07:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
e24b0b016c Merge pull request #14821 from Youtubeboy139/2023-EnerGen-Power-Cells 
2023 EnerGen Power Cells
 2023-06-03 19:09:44 +00:00
Heroman3003
a43114579e Merge pull request #14837 from KillianKirilenko/kk-teslafriend 
Friendlier Tesla Components
 2023-05-06 08:03:24 +00:00
Heroman3003
13cd2586c7 Merge pull request #14763 from KillianKirilenko/kk-canteven 
Field Generators Glow!
 2023-04-08 19:01:48 +00:00
Nadyr
3d4ed9d912 Merge pull request #5931 from CHOMPStation2/upstream-merge-14683 
[MIRROR] [MIRROR] Fixes a small hiccup in cable coil examine text
 2023-03-17 03:16:09 -04:00
Nadyr
c8ebdf68e9 Merge pull request #5888 from CHOMPStation2/upstream-merge-14624 
[MIRROR] Resolves SDMM warnings
 2023-03-17 00:53:08 -04:00
Heroman3003
e989b0df37 Merge pull request #14683 from VOREStation/upstream-merge-9030 
[MIRROR] Fixes a small hiccup in cable coil examine text
 2023-03-14 08:16:50 +00:00
Heroman3003
d99151151c Resolves SDMM warnings 2023-03-09 05:20:12 +00:00
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 05:08:26 +00:00
Rykka Stormheart
23ef6071bc Looping alarm powerloss/damage bugfix 
Alarms would continue to play soundloops due to mistakenly not clearing the loop on powerchange in the area.

This resolves those issues.
 2023-02-15 03:16:53 -08:00
Razgriz
6126a0ec69 Merge branch 'master' into shep-dev-looping-alarms 2023-02-14 15:17:33 -07:00
Rykka Stormheart
c8f8f935e3 Adds Delam warnings for SM/Engineering 2023-02-14 11:17:20 -08:00
Rykka Stormheart
4a5666580a Fix Supermatter Warning the Entire Station on explode 
SM, as it exists currently, will play the delamination warning over radio comms/globally when it is close to exploding, even if it isn't located on the station.
It would also benefit from a causality field, even outside it.

This fixes that.

Supermatter will no longer warn the entire station if it is presently being damaged unless it exists on the same levels as the station. 

It will also skip the causality field otherwise, though this is subject to Headmin review.
 2023-02-14 05:54:37 -08:00
Heroman3003
6b5a73d2da Merge pull request #14257 from Heroman3003/varios-fixes 
Various minor fixes
 2022-12-28 05:02:08 +00:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Verkister
fa285f457a Fixes grid check announcement 
I'm quite sure that neither centcom nor sif infrastructure are affected by the event occuring on the station.
 2022-12-06 15:35:02 +02:00
Nadyr
69d6ad3bb7 Merge pull request #5107 from CHOMPStation2/upstream-merge-13860 
[MIRROR] Gird check fixes
 2022-10-11 20:13:36 -04:00
Casey
f19cbeed71 Merge pull request #13860 from Heroman3003/grid-check-fixes 
Gird check fixes
 2022-10-10 03:03:38 +00:00
Casey
86ee514421 Merge pull request #13855 from Cameron653/overlay_madness 
Upgrades OverlaySS. Fixes #3627
 2022-10-10 03:02:27 +00:00
Casey
d8b03336e5 Sanitization 2022-10-02 17:58:34 +00:00
Casey
0727c30768 Merge pull request #13777 from Heroman3003/teleport-runtime 
Fixes teleport artifact not unbuckling mobs properly
 2022-09-23 00:57:47 +00:00
Casey
2fbd18b67c Merge pull request #13681 from Heroman3003/few-things-aaa 
Fixes a few minor things
 2022-09-10 20:35:43 +00:00
Nadyr
7276d043c7 Merge pull request #4863 from CHOMPStation2/upstream-merge-13671 
[MIRROR] More light updates!
 2022-09-07 16:10:31 -04:00
Casey
ceca2956e1 Merge pull request #13671 from Cameron653/light_overlay 
More light updates!
 2022-09-06 19:44:48 +00:00
Casey
c34eb89e54 Merge pull request #13663 from Heroman3003/paruntime 
Fixes runtime with self-shutoff of PA
 2022-09-06 19:36:59 +00:00
Nadyr
a06f70b32b Merge pull request #4845 from CHOMPStation2/upstream-merge-13660 
[MIRROR] Bugfix Palooza
 2022-09-04 18:40:29 -04:00
Nadyr
33581397f3 powder that makes you say yes 2022-09-04 18:20:07 -04:00
Casey
26e255fd34 Merge pull request #13659 from Cameron653/LIGHT_MODIFICATION 
Allows light manipulation via multitool.
 2022-09-04 21:51:33 +00:00
Casey
6d970b9e9c Bugfix Palooza 2022-09-04 21:51:29 +00:00
Novacat
c09320ccc9 Merge pull request #13590 from Novacat/nova-basicfixes 
Fixes breaker boxes not initializing
 2022-08-27 03:12:53 +00:00
Casey
95158e98ce Merge pull request #13332 from Heroman3003/teslamove 
Separates Forbids Events from Forbids Singulo
 2022-07-15 22:33:32 +00:00
Razgriz
bc41c8c2dc Merge branch 'master' into upstream-merge-13267 2022-07-03 17:22:19 -07:00
Razgriz
bb88a04785 powder that makes you say yes 2022-07-03 17:21:24 -07:00
Razgriz
9182699a95 Merge pull request #4496 from CHOMPStation2/upstream-merge-13264 
[MIRROR] Fairy lights
 2022-07-03 17:19:23 -07:00
Razgriz
00011f99c2 Merge pull request #4484 from CHOMPStation2/upstream-merge-13254 
[MIRROR] Fixes smes not connecting to powernet on construction
 2022-07-03 17:15:22 -07:00
Casey
3eda7b5ba6 That nice glow 2022-07-03 23:56:32 +00:00
Casey
386bb64824 Merge pull request #13264 from Very-Soft/fairylights 
Fairy lights
 2022-07-03 20:00:24 +00:00
Casey
92d8d0f432 Merge pull request #13254 from Heroman3003/smesfix 
Fixes smes not connecting to powernet on construction
 2022-07-03 09:08:15 +00:00
Casey
84e6bfd922 Makes all things that check for dorms check for forbid events var 2022-06-30 22:59:57 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Razgriz
975d04c425 Update cell.dm 2022-05-18 14:35:07 -07:00
Razgriz
d2927f4083 Update cell.dm 2022-05-18 14:00:56 -07:00
Razgriz
7e26f9d1a1 Restore power cell sprite to "V2" and add cells to protolathe 
-Restored power cell sprites to the "V2" sprites as I called them.
-Disabled base and virgo power cell/device/power_cell_research files and moved them into chomp modularity folder instead.

Added to the protolathe (I hope because I forgot to last time):
-Giga device cells
-Giga large cells
-Rechargeable weapon cell
-EMP-proof device cell
-EMP-proof weapon device cell
-Potato device cell


All the giga and recharging cells will require precursor tech 1.
 2022-05-18 00:28:31 -07:00
Novacat
e785bde04a Merge pull request #12821 from Very-Soft/solartweak 
Solar Tweak!
 2022-04-24 23:34:01 +00:00
Nadyr
6ba9806786 Merge pull request #4119 from CHOMPStation2/upstream-merge-12790 
[MIRROR] re-EnerGen Batteries
 2022-04-18 22:47:12 -04:00
Nadyr
ba220d82d2 powder that makes you say yes 2022-04-18 22:30:54 -04:00