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
54,135 Commits 8 Branches 0 Tags
c3bce04b6c2fce7f693b4552a8fcc4df93b28c98
Commit Graph

38658 Commits

Author SHA1 Message Date
ShadowLarkens
c3bce04b6c Restore TLV clamping 2020-08-16 05:19:18 -07:00
Schnayy
fefee99b5e Merge pull request #7464 from listerla/guru 
Minor chaplain changes/additions
 2020-08-15 01:10:26 -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
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
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
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
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
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
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
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
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
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
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
Atermonera
a1292af9c3 Merge pull request #7462 from listerla/pulling 
Adds audio and visual feedback to pulling.
 2020-08-12 14:47:32 -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
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
Atermonera
13350bae16 Merge pull request #7450 from lbnesquik/Kot-Cyborg-tweaky-tweka 
Manipulators now also drop items with alt click.
 2020-08-12 14:27:00 -04:00
Atermonera
194056340e Merge pull request #7447 from Cyantime/patch-3 
Gives NOREACT flag back to fixed microwaves
 2020-08-12 14:23:19 -04:00
Atermonera
6c3273bd20 Merge pull request #7444 from Mechoid/FixAutolatheForging 
Removes the ability to forge plasteel from steel.
 2020-08-12 14:21:01 -04:00
Atermonera
c4621602a3 Merge pull request #7441 from lbnesquik/Kot-MEchfab-staff 
Rename the shield drone to linear combat shield in mech fab.
 2020-08-12 14:19:44 -04:00
Atermonera
9bc7b15585 Merge pull request #7440 from Cyantime/patch-2 
Allows non-base welders to remove graffiti
 2020-08-12 14:18:27 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
Atermonera
ccf38e3c9e Merge pull request #7405 from Mechoid/Mortiferin 
Mortiferin
 2020-08-12 14:03:17 -04:00
rboys2
7de3ca1895 Update code/modules/food/drinkingglass/metaglass.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2020-08-12 13:21:30 -04:00
ShadowLarkens
5c6025b8e8 Merge remote-tracking branch 'upstream/master' into med_pass_2 2020-08-12 06:12:32 -07:00
Verkister
4df72d1052 Merge pull request #8629 from ShadowLarkens/tgui_engineering_less_travis_bork 
TGUI Engineering: Less broken Travis Edition (🤞)
 2020-08-12 15:12:44 +03:00
Riley
aacf8c9962 Pink moo drink 
this took me too long, me sleepy
 2020-08-12 03:32:07 -04:00
Novacat
d4637a1e52 Merge pull request #8659 from VOREStation/Verkister-patch-1 
Fixes synth brain transplant forcing bad real_name
 2020-08-11 23:01:24 -04:00
ShadowLarkens
a613010ecd TGUI Body Designer 2020-08-11 09:27:49 -07:00
Cyantime
4ca557d42b Minor bonuses for flying 2020-08-11 10:43:44 -04:00
ShadowLarkens
6215434bc3 TGUI File Cabinets 2020-08-11 06:31:29 -07:00
Rykka
4b4eaa428f Adds Hyena Cackle Emote - Standalone 
This allows for merging this separately/earlier than #8658.

Adds a hyena cackle emote for all our yeen friends out there.

YEENS ARE NOT ALL STIMKY. :U
 2020-08-11 08:25:09 -04:00
ShadowLarkens
ee1bbbd904 TGUI Virology machines 2020-08-11 05:24:49 -07:00
Verkister
001e53596d better way 2020-08-11 15:14:06 +03:00
Verkister
bfbdc686df Fixes synth brain transplant forcing bad real_name 
-Fixes the synth brain transplant rename prompt being a) broken, and b) having the capability to force a contaminated and unsanitized real_name var for the body, which in turn has the capability to kill regex and cause big issues.

In other words: an unnamed synth body wearing a person's ID gets their display name shown as "Unknown (as name)". The problematic part is that the brain transplant procedure here forces the new body to rename itself by the copied display name, AND also forces the real_name var into that without sanitizing. This causes the chat mention system to divide the unsanitized name into 3 names "Unknown", "(as", and "name)" and to shove these into regex to look for, and the rogue () in the names makes regex commit die and likely also break map loading and stuff.
 2020-08-11 14:59:21 +03:00
ShadowLarkens
f156857e14 TGUI Appearance Editor (Mirrors & Admin) 2020-08-10 08:08:33 -07:00