Commit Graph
1828 Commits
Author SHA1 Message Date
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
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
Selis 2fdb69ab5c Some input updates 2024-02-12 23:33:37 +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 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 691c3ca75f porting healthbars from RS + mat fixes 2024-01-29 00:00:25 +01:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +01:00
Repede aaf6f905b3 typo fix 2023-12-30 16:24:05 -05:00
Repede 0a98f39972 Event medals refactor 2023-12-30 15:18:24 -05:00
Repede 675afd5ae9 Event medal fluff items for 6 crew 2023-12-30 14:46:51 -05:00
izac112 2fdeac8c38 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-28 09:22:14 +01:00
dafsu 0bf27bc4b2 code 2023-12-22 20:59:10 +03:00
KashargulandGitHub 4ce06ee440 fixes and filters (#15626)
* fixes and filters

* remove the missed closing spans

* bundle added

* we also store empty hihglighting

* change the blacklist handling

* fix custom links in examine

* regenerate bundle

* automatic URL parsing for OOC/LOOC
2023-12-21 00:30:12 +01:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
PastelPrinceDan 5af5557f5e sprite fixes + edits + loadout add 2023-12-11 03:57:40 +00:00
Heroman 67026e62e4 Adds 'default' option for bloodreagents 2023-12-09 14:27:50 +10:00
Selis a4639e90be oldchat pref 2023-12-08 17:26:05 +01:00
PastelPrinceDan 0065dccc1b clothes and hair and even a tail oh wow 2023-12-06 07:53:18 +00:00
Killian 8f65da3b9f PDA ringtone QOL 2023-12-04 09:03:58 +00:00
Heroman3003andGitHub aca2ba9ccf Merge pull request #15521 from KillianKirilenko/kk-mini3
Jobfuscate!
2023-12-03 11:06:44 +10:00
Heroman3003andGitHub 554901c147 Merge pull request #15551 from TheToaster98/QuickLoadoutFix
Adds several extra EMT overwear pieces to loadout
2023-12-02 13:27:57 +10:00
TheToaster 7ef10ea8de Adds several extra EMT overwear pieces to loadout
Adds one or seven EMT/medical jackets, coats, vests and others to the loadout, also tries to put them together in a single list.

Tested and working properly, unless I mess up the PR.
2023-11-30 19:49:21 +01:00
Killian 4e7bcfb7ba Revert "Update 03_body.dm"
This reverts commit 1ea1da8c25.
2023-11-30 17:39:24 +00:00
Killian e50cbbe56e pda ringtone pref 2023-11-30 17:38:26 +00:00
izac112 5052f6f672 Merge branch 'release' of https://github.com/VOREStation/VOREStation; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2023-11-28 16:48:53 +01:00
Killian 1ea1da8c25 Update 03_body.dm
mmi/cyberbrain for meat bodies
2023-11-25 20:38:59 +00:00
Killian 1fbd1edf88 jobfuscate, director's cut 2023-11-17 20:36:01 +00:00
Killian f154c237e3 Merge remote-tracking branch 'upstream/master' into kk-mini3 2023-11-17 11:56:41 +00:00
Killian 8b69e10edb scaling center up-port 2023-11-13 21:23:41 +00:00
CaseyandGitHub 74c3fcd2c7 Merge pull request #15510 from FunnyCatEnjoyer/FunnyCat2
Adds the vintage PDA
2023-11-12 21:59:26 -05:00
Guy 1e6a124f23 Adds the vintage PDA 2023-11-08 13:05:02 -03:00
Killian 2cc25e3eca Merge remote-tracking branch 'upstream/master' into kk-leggies 2023-11-01 22:32:31 +00:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Killian 655114451e digitigrade legs port wip 2023-10-29 22:35:58 +00:00
Heroman3003andGitHub 2b32547bc0 Merge pull request #15473 from Runa-Dacino/ghostears
Adds a preference to NOT see subtles/whispers even if sender is OK with it or if admin
2023-10-26 04:19:41 +10:00
VerySoft 8f04cb0228 VerySoft Fluff Item!
Adds big round glasses, and adjusts the entries for the ITG id fluff items so they aren't tied to a specific character, since I have the same thing on multiple characters.

As part of this I made it so that glasses can appear above hair and things if they have the appropriate var set. (Otherwise glasses sprites mostly get covered up by any hair that gets near your eyes). All the other glasses behave the old way, but this should allow people to make some glasses appear above hair and things if they want to in the future.
2023-10-24 14:48:25 -04:00
Runa Dacino 6af3b172c1 add(preference): Toggle seeing subtles/whispers
Adds a toggle that overrides being an admin for seeing people's subtles/whispers. Meaning, even if you are an admin you won't see them. This is overriden by the sender's preference, IF they prefer privacy.
2023-10-23 16:38:01 +02:00
SelisandGitHub 9c05084d92 Merge pull request #15405 from KillianKirilenko/kk-throwies
Throw Notices
2023-10-10 12:14:31 +02:00
Heroman3003andGitHub 0db86c9124 Merge pull request #15437 from Heroman3003/fluffi
Adds approved fluff medal
2023-10-05 06:37:16 +10:00
Heroman a45a6f0abc Adds approved fluff medal 2023-10-05 06:06:38 +10:00
Enzo-Leon f5cc531bb9 Feedback adjustments for improved sentence structue. 2023-10-02 12:27:31 -07:00
Enzo-Leon f13f395db7 Altevian Adjustments - Descriptions & Small Tweaks 2023-10-02 11:40:19 -07:00
Killian cf6ea3434c convert throwmode messages to prefbased 2023-09-20 12:35:19 +01:00
Killian 8d682815a2 time: stamped 2023-09-16 10:26:23 +01:00
Killian 8ce5d24277 blood reagents refactor 2023-09-12 20:17:23 +01:00