cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 9 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

2838 Commits

Author SHA1 Message Date
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
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
8bfd87068f Change "Admin Login:" 
Change "Admin Login:" to "Staff Login:"
This is because realistically its logging more than JUST admins so the name annoys me personally, feel free to not merge lmao
 2023-06-15 13:05:36 +02:00
Nadyr
ea3c4ec289 Merge pull request #6299 from CHOMPStation2/upstream-merge-14942 
[MIRROR] Zera's Purple Cloak
 2023-06-09 21:58:40 -04:00
Nadyr
234de98640 powder that makes you say yes 2023-06-09 21:41:10 -04:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
a053cba8e8 Merge pull request #14935 from Runa-Dacino/ventroliquism 
Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them
 2023-06-03 09:22:13 +00:00
Heroman3003
bf4c7eeffe Zera's Purple Cloak 2023-06-03 09:20:53 +00:00
Nadyr
67208f1769 powder that makes you say yes 2023-05-31 18:35:21 -04:00
Heroman3003
8d4fe86bdf Adds new shoe: "Elegant Sandals". Adds it to loadout 2023-05-30 20:23:12 +00:00
Nadyr
883f2430ce Merge branch 'master' into upstream-merge-14893 2023-05-29 19:09:57 -04:00
Nadyr
2ba64a5b79 Merge pull request #6243 from CHOMPStation2/upstream-merge-14872 
[MIRROR] Uniform Selectors
 2023-05-29 19:06:25 -04:00
Nadyr
a828d32b39 powder that makes you say yes 2023-05-29 18:50:08 -04:00
Nadyr
b30356ebd4 Merge pull request #6245 from CHOMPStation2/upstream-merge-14894 
[MIRROR] Adds Aria's medal
 2023-05-29 18:41:55 -04:00
Nadyr
182873418f Merge branch 'master' into upstream-merge-14893 2023-05-29 18:41:05 -04:00
Heroman3003
c83f29cf13 Merge pull request #14894 from Heroman3003/aria-medal 
Adds Aria's medal
 2023-05-25 02:51:12 +00:00
Heroman3003
338d5f605b TG Clothing Pack Polish 2023-05-25 02:27:29 +00:00
Heroman3003
deae0d7291 Uniform Selectors 2023-05-25 02:14:01 +00:00
Heroman3003
feebcbac94 Merge pull request #14886 from KillianKirilenko/kk-fashion 
New Poncho Style
 2023-05-25 02:11:24 +00:00
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange 
Small custom-item changes
 2023-05-15 00:18:21 +00:00
Verkister
1bebca2c03 Fixes char setup tail layering. 
Guess we aint goin a bit elephant style for much longer.
 2023-05-02 16:53:01 +03:00
Nadyr
7200a5e85a Merge pull request #6164 from CHOMPStation2/upstream-merge-14823 
[MIRROR] Added striped dungarees and tiny tophat
 2023-04-30 22:49:59 -04:00
Heroman3003
d1460c5713 Added striped dungarees and tiny tophat 2023-05-01 00:58:13 +00:00
BlackMajor
65a5644b02 Ugh 2023-04-30 21:39:18 +12:00
Fluff
669570d26c Added the synthsizer 
Added the synthsizer
 2023-04-18 20:50:59 -04:00
Fluff
ca6f42e694 Added instruments to load out. 
Added the following instruments to the loudout
 2023-04-18 19:48:11 -04:00
Nadyr
61453b8e93 powder that makes you say yes 2023-04-16 00:15:51 -04:00
Heroman3003
0d5f21d733 Preferred Language + Autohiss Default Options 2023-04-14 05:32:03 +00:00
Nadyr
3439bbe48e Merge pull request #6065 from CHOMPStation2/upstream-merge-14772 
[MIRROR] Adds Mira's health services medal
 2023-04-11 01:09:46 -04:00
Nadyr
6c0584ab5b Merge pull request #6050 from Sharkmare/patch-27 
More efficient ShoesDel()
 2023-04-11 00:51:52 -04:00
Nadyr
45e1fbd0c5 Merge pull request #5924 from TheGreatKitsune/loadout-crystals 
Adds loadout capture crystals!
 2023-04-10 17:13:47 -04:00
Casey
790e2cbd81 Merge pull request #14772 from Runa-Dacino/mirafluff 
Adds Mira's health services medal
 2023-04-10 00:55:12 +00:00
Sharkmare
b78302161c More efficient ShoesDel() 
hints at deletion on init instead of manually calling deletion
 2023-04-07 16:56:54 +02:00
Heroman3003
bfd45cf2d0 Merge pull request #14750 from Cyantime/ftextreset 
Stop 'cancel' button from wiping flavor text
 2023-04-02 20:23:32 +00:00
TheGreatKitsune
99d9295bc3 Merge master into loadout-crystals 2023-04-01 08:56:27 -05:00
Heroman3003
bde7b77bab Crop Jackets 2023-03-31 01:23:22 +00:00
Rykka Stormheart
e601048e13 Fixes error with Species Sounds 
Unset ran into an error that did not occur during testing - select_default_species_sound was changed to use pref instead of user, and the testing calls were not updated.

Unathi had no species sounds.
 2023-03-23 05:10:29 -07:00
Razgriz
c057f9f0f8 Merge pull request #5813 from Rykka-Stormheart/shep-dev-barky-noises 
Sound Update: Mob Species Sounds (Gasp/Scream/Pain/Death/Cough/Sneeze)
 2023-03-22 14:32:04 -07:00
Seris02
fb677ceee1 better gargoyle code 2023-03-18 19:56:35 +08:00
Nadyr
e3e765c599 Merge pull request #5957 from Sharkmare/patch-18 
No shoes shoe option
 2023-03-17 04:01:26 -04:00
Nadyr
7dae5957cb Merge pull request #5920 from CHOMPStation2/upstream-merge-14675 
[MIRROR] Removes warcrimes from boots
 2023-03-17 02:34:13 -04:00
Nadyr
1a68f73406 Merge pull request #5915 from CHOMPStation2/upstream-merge-14670 
[MIRROR] Relaxes Sanitization
 2023-03-17 02:30:12 -04:00
Nadyr
d6048bd409 powder that makes you say yes 2023-03-17 02:12:55 -04:00
Sharkmare
79619dddcb Update loadout_shoes_vr.dm 2023-03-16 14:41:12 +01:00
Sharkmare
0f3870d9b9 oh right dreamchecker doesnt like this 2023-03-16 14:37:11 +01:00
Sharkmare
b100c26c11 unrelative the path 2023-03-16 14:34:29 +01:00
Sharkmare
ef4a4c2006 null paths dont work, big sad 2023-03-16 10:56:17 +01:00
Sharkmare
6a87c1df2c I mean, maybe it works 2023-03-16 10:34:28 +01:00
TheGreatKitsune
97701e8b3f Adds loadout capture crystals! 2023-03-13 16:58:03 -05:00