1951 Commits
Author SHA1 Message Date
KillianandGitHub cd6e87a30e loadout restrictions specified (#16072) 2024-07-03 17:19:46 +10:00
C.LandGitHub 8ff0932889 Adds Toggleable Stomachs w/ toggleable visibility (#16052)
* Adds Tummy

* Toggleable stomachs!

* Squash

Squash

* Update _planes+layers_vr.dm
2024-06-21 06:04:43 +10:00
KashargulandGitHub ab31632830 even more local defines (#16033) 2024-06-12 12:57:31 +10:00
izac112 186475ef6d Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-06-03 22:08:11 +02:00
KillianandGitHub b3aa4b75fa Auto-AFK (#15997)
* disable ingame changelog notification

* afk marker

* Auto-AFK Marking

* Update examine.dm

* Auto-AFK Marking w/ Pref
2024-05-26 17:16:44 +10:00
KillianandGitHub 815a47e333 Watch Yourself (#15972)
* watches

* watches

I didn't actually need any of this, it's all handled by the embedded gps
2024-05-12 05:05:39 +10:00
izac112 b100ef57d6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 2024-05-10 21:16:15 +02:00
Heroman3003andGitHub bf490b78ac Adds Contaminant Detector HUD (#15970) 2024-05-09 19:37:19 +10:00
KillianandGitHub e3e8246492 fluff licenses (#15967) 2024-05-09 10:07:17 +10:00
KillianandGitHub 333489f653 uniform insignia (#15957) 2024-05-04 16:51:11 +10:00
KillianandGitHub 097788529e Void Undersuit Tweaks (#15958)
* void undersuit tweaks

* Update eva_bodysuits.dm

* Revert "Update eva_bodysuits.dm"

This reverts commit 6f7acb6adfe9256f93d46115348be85aa4f90f6c.
2024-05-03 19:33:20 +10:00
KashargulandGitHub cb30f64b96 prevent flags default exclusion (#15941) 2024-04-26 04:08:19 +10:00
izac112 95279d346e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515 2024-04-24 23:28:19 +02:00
izac112 f609ac8565 Merge branch 'release' of https://github.com/VOREStation/VOREStation into vore-update 2024-04-02 17:26:31 +02:00
SatinIsleandGitHub 4a8b7c0067 Reduces the cost of the bluespace bracelet. (#15895)
Changed the cost of the bluespace bracelet in the loadout from 5 to 2.
2024-04-02 19:12:53 +10:00
SatinIsleandGitHub c2263d59ee Ports "No Shoes" from RogueStar (#15893)
* Ports No Shoes from RogueStar

Added the ability to choose to spawn with no shoes in character setup. This was ported from RogueStar: https://github.com/TS-Rogue-Star/Rogue-Star/pull/196

* Small fix
2024-04-02 19:10:11 +10:00
SatinIsleandGitHub d3f5c215f9 Fluff item (#15878)
Approved here: https://forum.vore-station.net/viewtopic.php?f=27&t=2401&p=14043#p14043
2024-03-30 05:57:35 +10:00
Runa-Dacino 14e1f6abc4 add(colours): Ports matrix/colormate stuff from CHOMP
Original PR: https://github.com/CHOMPStation2/CHOMPStation2/pull/6159
Original Author:
https://github.com/BlackMajor
2024-03-16 16:33:21 +01:00
SatinIsle 49219dbdbc Added wristbands
Added a single wristband for the left wrist that is recolourable.

Added 6 variants of a combo of three wristbands on the left wrist.
2024-03-10 19:54:01 +00:00
RaeschenandGitHub 484ffed97a Up-port: Various runtimes (#15802)
* Various runtimes (#7873)

* Some more preferences setup runtimes (#7884)

* Bug in #7884 making markings not show (#7888)
2024-03-10 09:40:08 +10:00
Heroman3003andGitHub c5153c5695 Merge pull request #15809 from Kashargul/SyndiPreEmag
Emags syndiborgs by default, borg petting pref
2024-03-06 16:57:00 +10:00
KashargulandGitHub 496cff40ff fixes broken chars (#15810) 2024-03-05 23:33:23 +01:00
KashargulandGitHub e5331e2008 some borg changes 2024-03-05 20:48:10 +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
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