cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,193 Commits 7 Branches 0 Tags
d97dd42464b9b43ca0f740c08830dd3eea5261eb
Commit Graph

38678 Commits

Author SHA1 Message Date
David Winters
d97dd42464 Flintlock's jacket 2020-08-17 06:11:58 -04:00
Novacat
2ca8206f56 Merge branch 'master' into Lun-Sprite 2020-08-17 01:19:47 -04:00
Novacat
005c47fa91 Merge pull request #8715 from VOREStation/upstream-merge-7451 
[MIRROR] Tweak to the washing machine.
 2020-08-17 00:25:13 -04:00
Novacat
d4289ada63 Merge pull request #8719 from VOREStation/revert-8716-upstream-merge-7426 
Revert "[MIRROR] Disable breaking fragile floor tiles with the crowbar"
 2020-08-17 00:25:00 -04:00
Novacat
f4d678f130 Merge pull request #8717 from VOREStation/upstream-merge-7515 
[MIRROR] Removes TURF_IS_FRAGILE from wooden flooring
 2020-08-17 00:05:18 -04:00
Novacat
23d318a825 Revert "[MIRROR] Disable breaking fragile floor tiles with the crowbar" 2020-08-17 00:05:00 -04:00
Novacat
8b8d816fa0 Merge pull request #8714 from VOREStation/upstream-merge-7490 
[MIRROR] Improves mecha strafing
 2020-08-17 00:03:39 -04:00
Novacat
f86a0e7769 Update washing_machine.dm 2020-08-17 00:02:57 -04:00
Atermonera
94e42939de Removes TURF)IS_FRAGILE from wooden flooring (#7515) 2020-08-16 23:54:08 -04:00
Kates
62b52c7844 Disable breaking fragile floor tiles with the crowbar (#7426) 
* Disable breaking floor tiles with the crowbar
It's not fun, it adds nothing to the gameplay and it isn't clear what breaks and what does. I see seriously zero reasons to keep this.

* Actually make it so you can pry off tiles still.
 2020-08-16 22:51:34 -04:00
Atermonera
d0b679fd88 Tweak to the washing machine. 2020-08-16 22:41:04 -04:00
Atermonera
7d6e90debf Merge pull request #7490 from lbnesquik/Kot-mech-854th-tweak 
Improves mecha strafing
 2020-08-16 22:39:49 -04:00
ShadowLarkens
a0ff48a33e Allows you to YEET mob holders 2020-08-16 17:18:39 -07:00
Verkister
5b29b10db2 Merge pull request #8704 from VictorZisthus/VictorZisthus/Maptweaks 
Victor zisthus/maptweaks
 2020-08-16 21:16:04 +03:00
Novacat
8890372739 Merge pull request #8706 from VOREStation/upstream-merge-7483 
[MIRROR] News update... April-May 2020
 2020-08-16 11:33:02 -04:00
ShadowLarkens
f2f2f57777 Canister drop sound 2020-08-16 07:44:20 -07:00
ShadowLarkens
c3bce04b6c Restore TLV clamping 2020-08-16 05:19:18 -07:00
Atermonera
1266d146b1 Merge pull request #7483 from Cerebulon/newsAug2020 
News update... April-May 2020
 2020-08-15 23:51:52 -04:00
Victor Zisthus
69ac92250a Access Overhaul + Minor Map Tweaks 
Overhauled most doors with new access codes as a result of the code fixes intended to keep departments as pure as possible.

Other changes marked below.

(77,111,1) Added Intercom
(77,110,1) Changed Door Sprite
(43,60,1) Added Atmos Access
(105,32,1) Tider's greetings...
(100,38,2) Set starting pressure to match other tanks.
 2020-08-15 18:26:43 -04: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