Commit Graph
20517 Commits
Author SHA1 Message Date
izac112 832099b9f2 Danger level and air alarm stuff
-80 air alarms
65 kpa air alarms
2024-03-31 00:05:43 +01:00
izac112 d5736793f1 Makes escape temp shielded 2024-03-19 21:34:16 +01:00
izac112 f97f00538e Temp shield and atmos bump
Temps shields: all shuttles
Temps shields: Arrivals
Temps shields: Teleporter
Doubles the already increased speed of the inlet, outlet and filters in regard to new supply loop
2024-03-17 12:30:17 +01:00
izac112 279b7f4f16 temp shield, radiator smes, relief regulator air mix
Makes the holodeck room temp shielded
Adds a radiator to the engine smes room
Adds a relief regulator to the atmos setup

Makes the engine room temperature shielded
2024-03-09 10:20:03 +01:00
izac112 0d5f8f7d14 Merge branch 'master' into heatengine 2024-03-08 02:28:51 +01:00
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
izac112 578e38108f Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-25 19:31:25 +01:00
BlackMajorandGitHub 723789a563 Small fix for planetary lighting (#15783) 2024-02-24 17:19:45 +10:00
5cf2f911f3 Tgui ui fix (#15778)
* AccountsTerminal.jsx

* Autolathe.jsx

* ExosuitFrabicator.jsx

* Biogenerator.jsx

* AirAlarm.jsx and borg control fx

* SuitCycler.jsx

* small typo

* 3 more UIs

* MiningVendor.jsx

* CameraConsole.jsx

* MessageMonitor.jsx

* Nif.jsx

* localState deprecation

* ResearchConsole.jsx

* DNAModifier.jsx

* oups...

* remove vv rounding

* mob sapwner

* lineendings

* Communicator.tsx not nice to look at, but works

* adding bundle

* small chat dropdown patch

* Update tgui/packages/tgui/interfaces/AirAlarm.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/AirAlarm.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

---------

Co-authored-by: Selis <sirlionfur@hotmail.de>
2024-02-23 21:09:18 +01:00
DrathekandGitHub 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
izac112 4d16b08a16 Merge branch 'master' into heatengine-izac 2024-02-18 03:58:28 +01:00
izac112 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
KashargulandGitHub 59d751a9f9 Round value adjustments for react (#15764)
* input adjustments

* .

* .
2024-02-16 14:18:54 +01:00
Selis 157ff3df1f Number modal 2024-02-12 23:33:37 +01:00
Heroman3003andGitHub cc7bf56ae5 Merge pull request #15744 from VOREStation/cleaned-defines
Cleaning up some defines
2024-02-12 06:12:25 +10:00
Heroman 55fe8e1657 Adds the Short Stacker 2024-02-11 19:08:49 +10:00
Selis d99321bfdf Cleaning up defines 2024-02-10 16:44:44 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
Heroman3003andGitHub f9dc59a272 Merge pull request #15723 from Kashargul/typofix
small typo
2024-02-04 09:17:51 +10:00
KashargulandGitHub f24e1ace5f small typo 2024-02-03 03:28:42 +01:00
KashargulandGitHub 8c3d15a68b typo 2024-01-31 11:46:41 +01:00
KashargulandGitHub 0d77816c04 fix some more font tags 2024-01-30 16:14:02 +01:00
SatinIsle 367e5a27bc Added 4 admin duckies
Added four new admin spawn rubber duckies with unique abilities.

Red Ducky: Plays the adminhelp sound, after a few uses, it explodes.

Blue Ducky: Spawns lube on the floor where you are standing.

White Ducky: Hits you with (fake) lightning.

Black Ducky: Literally just an anti-photon grenade, but it quacks.
2024-01-30 01:56:10 +00:00
Heroman3003andGitHub b088f0c604 Merge pull request #15708 from Kashargul/npcSay
Npc say filter
2024-01-29 15:25:39 +10:00
KashargulandGitHub 691c3ca75f porting healthbars from RS + mat fixes 2024-01-29 00:00:25 +01:00
KashargulandGitHub ee1ad2d7f1 initial 2024-01-28 08:13:31 +01:00
Repede 37b00fc041 Begin draft for heat engine - atmos sytem that cools down station rooms only 2024-01-28 01:28:34 -05:00
KashargulandGitHub d3b0c1ebe6 robot upgrade overhaul 2024-01-27 13:29:19 +01:00
Izac Joof ForsgrenandGitHub bac02656da Merge branch 'master' into uppstream-update 2024-01-22 06:35:01 +01:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +01:00
izac112 43aa56993b Bumps advanced roller beds surgery odds to 75% 2024-01-21 18:45:50 +01:00
Kashargul 1444a224a3 missed tags 2024-01-21 12:44:12 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
Heroman3003andGitHub f0de08713f Merge pull request #15678 from SatinIsle/bad-swimmer
Bad Swimmer
2024-01-20 04:59:31 +10:00
SatinIsle e2fc7fea62 Reduced message spam
There is now only a 10% chance of a message appearing. This feels about a good amount to keep the character splashing without getting too spammy. Lower numbers made it rare to send out a message at all.
2024-01-19 15:20:12 +00:00
Heroman3003andGitHub 4d0360ce61 Merge pull request #15686 from Burrito-Justice/master
Moves Falls map to Redgate, deletes Atoll
2024-01-19 15:00:03 +10:00
Heroman3003andGitHub cd6823c7e0 Merge pull request #15689 from Darlantanis/krakenmynemesis
Many bug fixes, QoL, and PDA notes port (now with sensible diffs)
2024-01-19 14:53:19 +10:00
NadyrandGitHub 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
Repede 017091959a fix 2024-01-18 21:01:07 -05:00
Repede 4541d4aabe shovel 2024-01-18 20:16:10 -05:00
Repede 9b619b8a95 ice blending 2024-01-18 19:48:39 -05:00
Repede c1fee1323b morefix 2024-01-18 19:16:15 -05:00
Repede 734ead1be6 Ready to review version 2024-01-18 18:37:54 -05:00
KashargulandGitHub 98b8589181 fix runtime and dupe 2024-01-18 23:58:59 +01:00
Burrito Justice 48f62de94b delete atoll, move falls to redgate 2024-01-18 13:15:54 -08:00
Repede 29fd7df39f Draft 2024-01-18 00:47:56 -05:00
Izac Joof ForsgrenandGitHub ab72e7475d Merge branch 'master' into maintflavoring 2024-01-15 20:47:08 +01:00
7e33bd1d78 Update code/game/objects/items/weapons/traps.dm
Co-authored-by: Izac Joof Forsgren <izac10@live.com>
2024-01-15 13:25:36 -05:00
SatinIsle 28ad56cd97 Bad Swimmer
Added a bad swimmer trait that slows you down in water and causes you to drown in deep water (depths of 2 or above).

One thing I would like to improve before merging and want advice on: Currently the splashing/"you are drowning" message spams pretty frequently and I would like to slow that down.
2024-01-15 14:43:43 +00:00
Repede 1118c62466 Fix resident tag 2024-01-14 23:42:11 -05:00