cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,135 Commits 5 Branches 0 Tags
c3bce04b6c2fce7f693b4552a8fcc4df93b28c98
Commit Graph

54135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ShadowLarkens
c3bce04b6c Restore TLV clamping 2020-08-16 05:19:18 -07:00
Novacat
fe88fbf3f5 Merge pull request #8702 from VOREStation/upstream-merge-7464 
[MIRROR] Minor chaplain changes/additions
 2020-08-15 02:20:59 -04:00
VirgoBot
86f60cca14 Minor chaplain changes/additions 2020-08-15 01:10:26 -04:00
Schnayy
fefee99b5e Merge pull request #7464 from listerla/guru 
Minor chaplain changes/additions
 2020-08-15 01:10:26 -04:00
Novacat
4936de6d1e Merge pull request #8701 from lm40/master 
fixes extra linebreak on vore examine
 2020-08-14 21:04:50 -04:00
lm40
ac328d76fe fixes examine linebreak 2020-08-14 20:46:34 -04:00
Novacat
0ae9116630 Merge pull request #8698 from ShadowLarkens/tgui_bugfixes 
Address a number of TGUI issues
 2020-08-14 15:59:07 -04:00
Novacat
432a04573c Merge pull request #8697 from VOREStation/upstream-merge-7463 
[MIRROR] Gives maint drones a T-ray scanner
 2020-08-14 14:05:25 -04:00
ShadowLarkens
f2d180ad09 Address a number of TGUI issues 
- SmartFridge has been tweaked to look better
 - ChemMaster no longer puts the units in bottle names by default
 - Trinary filter reads last_flow_rate again
 - Operating computer now works based off percentage of health, rather
   than real health (note, a tesh at -50 won't die until -100, but it'll
   trigger the -100% alarm)
 - Clicking on the knob in the canister UI no longer brings up a number
   input too small to enter values in the valid range. For right now,
   the knob stays, but this may be reconsidered in favor of a
   NumberInput if more people would prefer accessibility over
   skeuomorphism UI design.
 - Pipe dispenser has a bent pipe option again
 2020-08-14 10:55:08 -07:00
VirgoBot
5df0fa002b Gives maint drones a T-ray scanner 2020-08-14 06:46:42 -04:00
listerla
110e883665 Gives maint drones a T-ray scanner (#7463) 2020-08-14 06:46:42 -04:00
Novacat
c7a562b53d Merge pull request #8664 from rboys2/clara-dev-pink-moo-drink 
Pink Moo Drink
 2020-08-13 15:02:11 -04:00
Novacat
4b42ccca47 Merge pull request #8657 from Cyantime/patch-4 
Minor buffs for flying
 2020-08-13 15:01:28 -04:00
Novacat
0e4f7831cb Merge pull request #8695 from ShadowLarkens/fix_ai_hotkeys 
AI Hotkeys fix after TGUI Engineering
 2020-08-13 13:59:26 -04:00
ShadowLarkens
4f122c591a AI Hotkeys fix after TGUI Engineering 2020-08-13 07:07:58 -07:00
Novacat
744a64b9c9 Merge pull request #8689 from Rykka-Stormheart/shep-dev-client-ambience-preference 
Adds Repeating Ambience and Ambience Chance Preferences!
 2020-08-13 07:05:47 -04:00
Novacat
0720118882 Merge pull request #8691 from Rykka-Stormheart/shep-dev-TGUI-asset-cache-fix 
Fix Asset Cache Verification - BYOND js Bugfix
 2020-08-13 06:53:55 -04:00
Riley
4b5a2c60d2 Merge remote-tracking branch 'origin/clara-dev-pink-moo-drink' into clara-dev-pink-moo-drink 2020-08-13 04:11:14 -04:00
Riley
80bc172478 Merge remote-tracking branch 'VORE_MASTER/master' into clara-dev-pink-moo-drink 2020-08-13 04:08:40 -04:00
Rykka
f6105bc3b5 Fix Asset Cache Verification - TGUI Bugfix 
BYOND is injecting html to load js shims into json files returned by xhr. this will get fixed in a later byond release, but this disables the functionality for the asset cache skin control today.

Fix to be removed once the HTML injection is removed from asset cache (pending a BYOND change).
 2020-08-13 04:02:22 -04:00
Novacat
44efe87daa Merge pull request #8690 from ShadowLarkens/grinder_fix 
Fix the reagent grinder
 2020-08-13 03:52:47 -04:00
ShadowLarkens
41656d298f Fix the reagent grinder 2020-08-13 00:36:31 -07:00
Rykka
9690f85ec3 Adds Repeating Ambience and Ambience Chance Preferences! 
Adds a Random Ambience Frequency and Ambience Chance Setting under Global, underneath Client FPS. Images here:

![](https://i.imgur.com/381HPGH.png)
![](https://i.imgur.com/tWuff1W.png)
![](https://i.imgur.com/smEtoQ9.png)

Self-explanatory. Random-Ambience-Frequency controls how long before it checks if it can play ambience to you again. Setting it to 0 disables the random re-play of ambience.

Ambience Chance affects the % chance to play ambience to your client. It defaults to 35%, but can be set from 0 to 100 to disable it or always play every time you move into an area or have the Random Ambience check called.
 2020-08-13 01:40:23 -04:00
Novacat
04643ad4a7 Merge pull request #8688 from rboys2/clara-dev-choccymilk-resprite 
Re-sprites choccy milk
 2020-08-12 22:54:23 -04:00
Novacat
82f5b664bf Merge pull request #8687 from Rykka-Stormheart/shep-dev-vhelp-update 
Adds gao and cackle to vhelp!
 2020-08-12 22:53:56 -04:00
Novacat
34a2d14bf9 Merge pull request #8684 from VOREStation/upstream-merge-7435 
[MIRROR] Accessory colors aren't modified by clothing colors
 2020-08-12 22:52:41 -04:00
Riley
ce241f671b Re-sprites Choccy milk 
I think I did it right :)
 2020-08-12 22:38:33 -04:00
Rykka
7710016a79 Adds gao and cackle to vhelp! 
Forgot to add cackle, and turns out gao wasn't on the list either.
 2020-08-12 21:55:44 -04:00
VirgoBot
f609f90b09 Accessory colors aren't modified by clothing colors 2020-08-12 21:31:56 -04:00
Atermonera
e79819146f Accessory colors aren't modified by clothing colors (#7435) 2020-08-12 21:31:56 -04:00
Novacat
e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2 
TGUI Medical: Second Pass
 2020-08-12 20:01:12 -04:00
Novacat
cc0d7eb3a7 Merge pull request #8682 from VOREStation/upstream-merge-7462 
[MIRROR] Adds audio and visual feedback to pulling.
 2020-08-12 15:05:39 -04:00
Novacat
29ab96e84c Merge pull request #8681 from VOREStation/upstream-merge-7461 
[MIRROR] Ports Bastion of Hestia rig sounds
 2020-08-12 15:05:21 -04:00
Novacat
34eb1ba0f7 Merge pull request #8679 from VOREStation/upstream-merge-7457 
[MIRROR] Adds second confirmation to character slot reset
 2020-08-12 15:04:47 -04:00
Novacat
88d75ecf46 Merge pull request #8678 from VOREStation/upstream-merge-7458 
[MIRROR] Replaces curtain sprites with World Server sprites
 2020-08-12 15:04:34 -04:00
Novacat
253e096e06 Merge pull request #8676 from VOREStation/upstream-merge-7453 
[MIRROR] Fix: Prevent planet weather sounds in Transit
 2020-08-12 14:56:19 -04:00
Novacat
3b12ac466e Merge pull request #8675 from VOREStation/upstream-merge-7450 
[MIRROR] Manipulators now also drop items with alt click.
 2020-08-12 14:56:04 -04:00
Novacat
9f65e91c51 Merge pull request #8674 from VOREStation/upstream-merge-7448 
[MIRROR] Shower Audio Reduction - Replaces audio files with quieter versions of them!
 2020-08-12 14:55:50 -04:00
Novacat
04027e16d0 Merge pull request #8673 from VOREStation/upstream-merge-7447 
[MIRROR] Gives NOREACT flag back to fixed microwaves
 2020-08-12 14:55:20 -04:00
Novacat
8ccf5d93db Merge pull request #8672 from VOREStation/upstream-merge-7444 
[MIRROR] Removes the ability to forge plasteel from steel.
 2020-08-12 14:55:04 -04:00
Novacat
90f4c40a9c Merge pull request #8671 from VOREStation/upstream-merge-7441 
[MIRROR] Rename the shield drone to linear combat shield in mech fab.
 2020-08-12 14:54:50 -04:00
Novacat
9882285544 Merge pull request #8670 from VOREStation/upstream-merge-7440 
[MIRROR] Allows non-base welders to remove graffiti
 2020-08-12 14:54:35 -04:00
Novacat
8658100fba Merge pull request #8669 from VOREStation/upstream-merge-7431 
[MIRROR] ports a whole lot of Teshari stuff from Arkstation
 2020-08-12 14:54:22 -04:00
Novacat
b8e1203413 Merge pull request #8668 from VOREStation/upstream-merge-7405 
[MIRROR] Mortiferin
 2020-08-12 14:53:37 -04:00
VirgoBot
505a009233 Adds audio and visual feedback to pulling. 2020-08-12 14:47:32 -04:00
Atermonera
a1292af9c3 Merge pull request #7462 from listerla/pulling 
Adds audio and visual feedback to pulling.
 2020-08-12 14:47:32 -04:00
VirgoBot
3bfd508dfb Ports Bastion of Hestia rig sounds 2020-08-12 14:46:17 -04:00
Atermonera
d61cf8be05 Merge pull request #7461 from listerla/rigsounds 
Ports Bastion of Hestia rig sounds
 2020-08-12 14:46:17 -04:00
VirgoBot
b84fd70804 Adds second confirmation to character slot reset 2020-08-12 14:41:33 -04:00
Atermonera
8ceeff6e81 Merge pull request #7457 from Cyantime/patch-4 
Adds second confirmation to character slot reset
 2020-08-12 14:41:33 -04:00