Commit Graph
14035 Commits
Author SHA1 Message Date
izac112 0d5f8f7d14 Merge branch 'master' into heatengine 2024-03-08 02:28:51 +01:00
Repede 6561697459 Merge branch 'heatengine' of https://github.com/Yawn-Wider/YWPolarisVore into heatengine
# Conflicts:
#	code/ATMOSPHERICS/components/station_boiler.dm
#	maps/yw/cryogaia-04-maintenance.dmm
2024-02-29 18:04:47 -05: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
KashargulandGitHub 609f6c031a chat Timestamps for TG chat + some fixes (#15770)
* chat Timestamps

* add bundle

* some fixes

* bundle

* some context

* moving healthbar proc to 95%

* more context

* fix Process death type

* healthbar fix

* ye if we want to export it, we should expose it

* char directory follow up

* adds bundles
2024-02-21 17:32:43 +10: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 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
KashargulandGitHub 04c57ff76a another form (#15766) 2024-02-16 12:09:18 +01:00
KashargulandGitHub 16fd2d94a0 more filter and borg admin stuff (#15745)
* more filter and borg admin stuff

* analyzer fix

* .

* vchatdark css fix
2024-02-11 16:54:14 +01:00
SatinIsle 871d1ebe3f Fluff item for grallstonefist
Approved here: https://forum.vore-station.net/viewtopic.php?f=27&t=2397
2024-02-10 11:39:50 +00:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
Heroman3003andGitHub 82812ea2e6 Merge pull request #15733 from BonniePandora/Replikant
Ports various clothing items, two sets of cyberlegs & some markings
2024-02-08 03:56:39 +10:00
PastelPrinceDan 373bb64cc7 adds 1 outfit, port 1 pair of ears, fixes 2 hairs 2024-02-07 12:23:13 +00:00
BonniePandora d561f31319 Replikant stuff
Items, robolimbs & markings
2024-02-06 00:25:50 +00:00
KashargulandGitHub ed19c72ece some more cleanup 2024-02-03 16:41:33 +01:00
KashargulandGitHub b12ddd69a1 borgjaw rebalance 2024-02-03 16:28:22 +01:00
Heroman3003andGitHub 24904c6665 Merge pull request #15716 from Heroman3003/borgmind
Gives borg some trait verbs
2024-02-01 14:51:12 +10:00
Heroman b63c0574eb Ordering 2024-01-31 19:13:08 +10:00
Heroman 7718dbb2db Adds borg jobban check to mindswap traits 2024-01-31 19:12:00 +10:00
Heroman ccca346253 Gives borg some trait verbs 2024-01-31 18:40:08 +10:00
KashargulandGitHub 4550f295dc needs to have a client anyway 2024-01-31 00:21:44 +01:00
KashargulandGitHub 30552a2b72 adds timestamps to all radio messages 2024-01-31 00:19:41 +01: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 6a8498ef1f npc say filter 2024-01-28 08:29:00 +01:00
KashargulandGitHub 41843dba16 missing closing tag 2024-01-27 13:46:57 +01:00
KashargulandGitHub 221785030d static path 2024-01-27 13:45:34 +01:00
KashargulandGitHub d3b0c1ebe6 robot upgrade overhaul 2024-01-27 13:29:19 +01:00
Heroman3003andGitHub 6d1acf98db Merge pull request #15695 from Kashargul/endOfStaticCol
remove static chat colour tags
2024-01-27 15:47:33 +10:00
SpaceMan-JimandGitHub dba08cdfa8 Raptor sprite overhaul 2024-01-26 16:29:34 -06:00
RepedeandGitHub 5957f03154 Teshfix (#1410)
* Fix teshari sprite when scooped up

* comment add

* remove duplicate code
2024-01-25 10:12:17 +01:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +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
Repede b3e5e0e544 Adds a neutral trait, the Hydra Trait from Skyrat, allowing someone with a name like Hello-Man-Hatan to show up as one of the 3 names, or reset back to that name. 2024-01-20 19:46:08 -05:00
Heroman3003andGitHub f0de08713f Merge pull request #15678 from SatinIsle/bad-swimmer
Bad Swimmer
2024-01-20 04:59:31 +10:00
NadyrandGitHub 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
KashargulandGitHub 6184e0b7bc fixes small typo 2024-01-18 21:00:32 +01:00
KashargulandGitHub e2575713cc ends multiproccing on butchering 2024-01-15 17:27:04 +01: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
Jay 026c8bf57f Large Bunny Ears (Requested)
Adds large colorable bunny ears to the loadout character customization menu.
2024-01-14 03:01:41 -05:00
Heroman3003andGitHub cc48404f9c Merge pull request #15671 from Very-Soft/spider
Spider
2024-01-14 07:07:20 +10:00
Eli 92f49ad6c2 Var added to simplemob base 2024-01-10 19:35:27 +11:00
Eli a3626420af Revert "Var added to each simplemob"
This reverts commit 8058c51cef.
2024-01-10 19:34:25 +11:00
VerySoft 4300ac3b4d re add nurse broodling 2024-01-09 16:15:13 -05:00
VerySoft c32d33fad9 Spider
Makes it so that nurse spiders can't spawn from any random sources, such as spider egg clusters, spider spawners, and capture crystals.

GMs and map makers can still put nurse spiders out if they want to, but this should stop any UNEXPECTED nurse spiders from appearing, and stop spiders from snowballing quite so hard when the conditions are right.
2024-01-09 14:59:42 -05:00
Eli 8058c51cef Var added to each simplemob 2024-01-09 10:31:40 +11:00
izac112 f0a947b8b2 Fixes the alcohol traits 2024-01-07 23:15:57 +01:00
izac112 c8a8aa3c12 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-01-01 20:28:55 +01:00