cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 02:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,893 Commits 8 Branches 26 Tags
f9052dbb607368657bdf2a875b514cdce08017dd
Commit Graph

1524 Commits

Author SHA1 Message Date
ShadowLarkens
f9052dbb60 Revert "Merge pull request #16240 from ShadowLarkens/revert" 
This reverts commit 885171f985, reversing
changes made to 3e314f8064.
 2024-09-07 14:11:15 -07:00
Heroman3003
38f1703110 Merge pull request #16257 from Darlantanis/Aug2024Fixes2 
September 2024 various fixes
 2024-09-08 06:33:55 +10:00
SatinIsle
4e0352cb23 Spiked wristband 
Added a spiked wristband accessory to loadout and vending machines.
 2024-09-03 13:53:48 +01:00
Nadyr
eff6c5749c September 2024 adds, QoL and fixes 2024-09-02 23:12:15 -04:00
Kashargul
2f19f66cc5 default tgui alert input handling (#16241) 
* default handling

* do not push that

* fix

* .

* .
 2024-09-02 04:27:26 +10:00
Kashargul
65bf1fe4de prefs and scaling (#16251) 2024-09-02 04:22:21 +10:00
ShadowLarkens
3c09f52c6a Revert "/tg/ pref datums (part 1) (#16219)" 
This reverts commit faac97e352.
 2024-08-31 12:04:15 -07:00
ShadowLarkens
faac97e352 /tg/ pref datums (part 1) (#16219) 
* TG Prefs (Step 1: JSON savefiles)

* TG Prefs (Step 2: Preference Datum Code)

* TG Prefs (Step 3: Convert /datum/client_preferences)

* TG Prefs (Step 4: Clean up and finishing touches)

* Fix some weird compile errors from the rebase
 2024-08-31 07:09:05 +10:00
Heroman3003
4991c2edf8 Revert "Revert "Removed negative trait limit (#16214)" (#16231)" (#16232) 
This reverts commit 8e8b46b228.
 2024-08-31 05:43:02 +10:00
Heroman3003
8e8b46b228 Revert "Removed negative trait limit (#16214)" (#16231) 
This reverts commit 041abec5b6.
 2024-08-31 05:31:57 +10:00
SatinIsle
041abec5b6 Removed negative trait limit (#16214) 
This PR was made for staff discussion and should not be merged until staff agree on it.

Changed negative traits to no longer reduce the "traits left" count, allowing you to take as many as you would like. This allows people to potentially take up to five positive traits, provided that they take enough negative traits to gain the points.

Fixed non-custom species being able to completely ignore trait count and trait point limits.
 2024-08-31 05:25:02 +10:00
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
ShadowLarkens
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
Nadyr
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
Killian
7a23e81d00 martian miner coat adjustments (#16171) 2024-08-12 05:18:42 +10:00
Killian
4406e228fa revert throw notifs (#16169) 2024-08-12 05:18:28 +10:00
Killian
721d27609f Late Selectors Pass Addon (#16144) 
* selectors pass

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

* Update eva_bodysuits.dm

* Revert "Update eva_bodysuits.dm"

This reverts commit 6f7acb6adf.

* military jacket tweaks

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

This reverts commit ccc1470eb9, 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
Killian
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
dan
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
Killian
cd6e87a30e loadout restrictions specified (#16072) 2024-07-03 17:19:46 +10:00
C.L
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
Kashargul
ab31632830 even more local defines (#16033) 2024-06-12 12:57:31 +10:00
Killian
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
Killian
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
Heroman3003
bf490b78ac Adds Contaminant Detector HUD (#15970) 2024-05-09 19:37:19 +10:00
Killian
e3e8246492 fluff licenses (#15967) 2024-05-09 10:07:17 +10:00
Killian
333489f653 uniform insignia (#15957) 2024-05-04 16:51:11 +10:00
Killian
097788529e Void Undersuit Tweaks (#15958) 
* void undersuit tweaks

* Update eva_bodysuits.dm

* Revert "Update eva_bodysuits.dm"

This reverts commit 6f7acb6adf.
 2024-05-03 19:33:20 +10:00
Kashargul
cb30f64b96 prevent flags default exclusion (#15941) 2024-04-26 04:08:19 +10:00
SatinIsle
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
SatinIsle
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
SatinIsle
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
Raeschen
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
Heroman3003
c5153c5695 Merge pull request #15809 from Kashargul/SyndiPreEmag 
Emags syndiborgs by default, borg petting pref
 2024-03-06 16:57:00 +10:00
Kashargul
496cff40ff fixes broken chars (#15810) 2024-03-05 23:33:23 +01:00
Kashargul
e5331e2008 some borg changes 2024-03-05 20:48:10 +01:00
Drathek
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 afbdd1d844.

* 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 de22ad375d.

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

* Try again
 2024-02-20 11:28:51 +01:00
Kashargul
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
Heroman3003
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
Kashargul
691c3ca75f porting healthbars from RS + mat fixes 2024-01-29 00:00:25 +01:00
dafsu
0bf27bc4b2 code 2023-12-22 20:59:10 +03:00
Kashargul
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
PastelPrinceDan
5af5557f5e sprite fixes + edits + loadout add 2023-12-11 03:57:40 +00:00