cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,141 Commits 8 Branches 0 Tags
00c822d64f02cd413ab23b2acc8593a28b045f96
Commit Graph

14716 Commits

Author SHA1 Message Date
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
1f99e6ce53 Merge pull request #6329 from CHOMPStation2/upstream-merge-14976 
[MIRROR] More 515 Compatibility
 2023-06-18 14:59:19 +02:00
Heroman3003
228dea8e8c Merge pull request #15032 from silicons/wallflowering 
Adds the ability to move through people who are intentionally pixel shifted
 2023-06-18 08:46:19 +00:00
Raeschen
8faf2de8e7 fix merge conflicts 2023-06-18 10:05:17 +02:00
Heroman3003
de3515f925 Adds per-belly option to vorepanel for switching between sleeper/belly 2023-06-18 10:05:16 +02:00
Heroman3003
6ffab8bada Synthetic chassis taur body 2023-06-17 23:57:43 +02:00
Raeschen
fd87fd5da1 Merge pull request #6367 from Sharkmare/patch-36 
Change "Admin Login:"
 2023-06-17 23:46:46 +02:00
Raeschen
5b6758eb2a Merge pull request #6357 from CHOMPStation2/upstream-merge-15007 
[MIRROR] Larger cobra hood
 2023-06-17 23:44:36 +02:00
Raeschen
c9d7a12694 Merge pull request #6346 from CHOMPStation2/upstream-merge-14992 
[MIRROR] Tweaks Long Predatorial Reach (Persistence, trait panel)
 2023-06-17 23:01:24 +02:00
Raeschen
207ea513c9 Merge pull request #6341 from CHOMPStation2/upstream-merge-14991 
[MIRROR] New mermaid tails
 2023-06-17 22:58:23 +02:00
Raeschen
22f6c33c84 Merge pull request #6336 from ItsSelis/selis-runtime-fixes 
A few nullchecks
 2023-06-17 22:54:57 +02:00
Rykka Stormheart
45198d7bc7 Removes Stunned Loop 2023-06-17 06:28:07 -07:00
Rykka Stormheart
768d250350 Fixes Simplemob Slowdown for CHOMPStation 
Also fixes Promethean blob movement, finally.
 2023-06-17 06:04:09 -07:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Raeschen
d75f897ef8 Merge branch 'master' into upstream-merge-14758 2023-06-17 13:40:40 +02:00
Raeschen
d631e5f691 fix merge conflicts 2023-06-17 13:38:08 +02:00
Raeschen
1c8cb00b7f Merge pull request #6088 from CHOMPStation2/upstream-merge-14756 
[MIRROR] Preferred Language + Autohiss Default Options
 2023-06-17 13:25:34 +02:00
Raeschen
d4992917ce Fix merge conflicts 2023-06-17 13:07:51 +02:00
Raeschen
8a45e72bb7 sync the fluff (but comment out) 2023-06-17 11:59:50 +02:00
Raeschen
4d36ac9097 fix chompedited fluffitems 2023-06-17 11:50:36 +02:00
Raeschen
ab0c4e7166 resync files to upstream 2023-06-17 11:44:04 +02:00
Heroman3003
071cdb22f1 Selective Markings Port 
Rebase to master
 2023-06-17 09:52:59 +02:00
Seris02
cf690461db ip whitelists 2023-06-16 16:47:05 +08: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
Sharkmare
f4b3325c1e Staff Logout notice 2023-06-15 14:56:26 +02:00
FoxglovePurpur
64b47796ca Update pai.dm 
Fixed the comment <3
 2023-06-13 14:13:27 -07:00
FoxglovePurpur
11cb4b2bde Update pai.dm 
Added missing comment.
 2023-06-13 14:08:33 -07:00
Digi Purpur
da120bab14 GPS Text and Spelling Fixes 
The GPS on/off text was reversed and this fixes it. Along with a couple others. The largest "change" is the change of posessed to possessed (since it requires an actual file-name change.)
 2023-06-13 13:35:53 -07:00
Heroman3003
0ba253d1d7 Larger cobra hood 2023-06-11 20:21:10 +00:00
Nadyr
b6fffdf176 Merge pull request #6318 from Seris02/corpsesensors 
stops vox npcs from showing up on sensors
 2023-06-09 22:31:00 -04:00
Nadyr
81b3ccb3a0 Merge pull request #6304 from CHOMPStation2/upstream-merge-14936 
[MIRROR] Little Weakref Refactor
 2023-06-09 22:27:56 -04:00
Nadyr
d83d7fcd3c Merge pull request #6306 from CHOMPStation2/upstream-merge-14954 
[MIRROR] Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter
 2023-06-09 22:19:01 -04:00
Nadyr
002a1e1ce3 Merge pull request #6301 from CHOMPStation2/upstream-merge-14946 
[MIRROR] Changes bloodsucker subtle mode to use italics rather than bold
 2023-06-09 22:05:10 -04:00
Nadyr
cd32adc93a Merge pull request #6297 from CHOMPStation2/upstream-merge-14938 
[MIRROR] Variety Add-on
 2023-06-09 21:46:13 -04:00
Nadyr
8fd186a21a powder that makes you say yes 2023-06-09 21:34:21 -04:00
Heroman3003
faf96ca6c1 Merge pull request #14992 from Runa-Dacino/longpredator 
Tweaks Long Predatorial Reach (Persistence, trait panel)
 2023-06-09 18:30:46 +00:00
Heroman3003
12cee927a8 Merge pull request #14991 from SatinIsle/Mermaid-Tail 
New mermaid tails
 2023-06-08 10:39:36 +00:00
ItsSelis
368721e4ca A few nullchecks 2023-06-07 20:20:47 +02:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Kassc
271c76a9c8 Merge pull request #6234 from Darlantanis/VRunjank 
VR tweaks and mob transformation
 2023-06-04 14:26:38 -04:00
Seris02
6c5a4fe2d2 stops vox npcs from showing up on sensors 2023-06-04 20:11:18 +08:00
Heroman3003
eace150b2b Merge pull request #14954 from Runa-Dacino/subtledrips 
Modifies bloodsucker subtle bleedless mode to NOT leave bloodsplatter
 2023-06-03 19:08:16 +00:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
ab18ffabbc Merge pull request #14946 from Runa-Dacino/italianpasta 
Changes bloodsucker subtle mode to use italics rather than bold
 2023-06-03 09:21:02 +00:00
Heroman3003
2c0cff3885 Variety Add-on 2023-06-03 09:20:41 +00:00
Kassc
71393b70d5 Merge pull request #6266 from Aroliacue/aro_traits 
Pressure Trait Expansion, Fixes to Heavyweight Trait
 2023-06-01 19:57:31 -04:00
Nadyr
5b9155b714 powder that makes you say yes 2023-05-31 18:53:21 -04:00
Heroman3003
5e1c1a1366 Adds new human ability: "Explain Custom Traits" 2023-05-31 18:53:21 -04:00
Nadyr
94f7414bca Merge pull request #6279 from CHOMPStation2/upstream-merge-14921 
[MIRROR] reworks handling of transparent limbs (manual mirror)
 2023-05-31 18:42:48 -04:00
Heroman3003
905d26f647 Merge pull request #14921 from Seris02/mirrortransparent 
reworks handling of transparent limbs (manual mirror)
 2023-05-31 08:38:10 +00:00