Commit Graph
1963 Commits
Author SHA1 Message Date
Lewzharri 966a26bffd Fluff Item Whitelist Addition
https://forum.vore-station.net/viewtopic.php?f=26&t=2435
2024-08-21 12:43:18 +01:00
7a7920f29e TGUI Say (#16160)
* TGUI Say

* Add icon_ref_map.json to make tgui-dev-server stop screaming

* Update tgui.bundle.js

* bundle recompile

---------

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Heroman <alesha3000@list.ru>
2024-08-12 05:48:06 +10:00
NadyrandGitHub 65c3fa8e56 Fixes species blood color (#16174)
* Fixes species blood color

* adds color dot to blood color button
2024-08-12 05:18:53 +10:00
KillianandGitHub 7a23e81d00 martian miner coat adjustments (#16171) 2024-08-12 05:18:42 +10:00
KillianandGitHub 4406e228fa revert throw notifs (#16169) 2024-08-12 05:18:28 +10:00
KillianandGitHub 721d27609f Late Selectors Pass Addon (#16144)
* selectors pass

* selectors? selectors!
2024-08-03 07:50:57 +10:00
KillianandGitHub d3767ec44f selectors pass (#16137) 2024-08-01 15:56:48 +10:00
KillianandGitHub 33ba08daec Patchless Military Jackets (#16114)
* void undersuit tweaks

* Update eva_bodysuits.dm

* Revert "Update eva_bodysuits.dm"

This reverts commit 6f7acb6adfe9256f93d46115348be85aa4f90f6c.

* military jacket tweaks

* Revert "Merge branch 'kk-fashion' of https://github.com/KillianKirilenko/VOREStation into kk-fashion"

This reverts commit ccc1470eb92a1131aad0863b34acb3f2d8b4d95e, reversing
changes made to 92da6db226.

* fix sprites

* fixed files getting eaten

HATE. LET ME TELL YOU HOW MUCH I'VE COME TO HATE GITHUB.
2024-07-22 05:13:43 +10:00
KillianandGitHub 1f839e5969 Char Setup Background Switch (#16118)
* disable ingame changelog notification

* afk marker

* Auto-AFK Marking

* Update examine.dm

* Auto-AFK Marking w/ Pref

* Char Setup Background Switch
2024-07-21 20:01:50 +10:00
92da6db226 yet another clothing port pr (#16105)
* loadout additions

* forgot a comma

* i forgor something

---------

Co-authored-by: PastelPrinceDan <amayahsslut@gmail.com>
2024-07-21 19:56:01 +10:00
izac112 2d5dc807cb Nipping this in the bud
Update vorestation.dme
2024-07-17 17:00:09 +02:00
izac112 04de351a1e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-07-17 16:14:16 +02:00
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