Commit Graph

1648 Commits

Author SHA1 Message Date
Sharkmare
f59ec1b2da Fixing traits left display
Currently, traits left are displayed before the traits left are calculated, resulting in it always displaying max traits.
This addresses this
2021-03-04 17:36:50 +01:00
Novacat
bb92753fe1 Merge pull request #9710 from KillianKirilenko/kk-misc4
Go [Verb] Yourself!
2021-03-03 11:09:25 -05:00
Meghan-Rossi
de166277c9 fix https://github.com/VOREStation/VOREStation/issues/9697
Fixes https://github.com/VOREStation/VOREStation/issues/9697
2021-03-03 02:50:42 +00:00
Unknown
6bdbd1e0f1 Fixes something that was overlooked 2021-02-28 19:09:56 -05:00
Unknown
8e2ca21034 Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2021-02-28 19:06:25 -05:00
Novacat
7ea7566f26 Merge pull request #9799 from VOREStation/upstream-merge-7920
[MIRROR] Removes ping subsystem that was breaking chat
2021-02-28 18:01:52 -05:00
Unknown
098af65aa7 Adds Smuggler PDA Cartridge
-Adds Smuggler PDA Cartridge for adminbus
-Adds Bluespace Badge to loadout
2021-02-28 14:05:46 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Verkister
4ea4eecf28 Steals and fixes a memory leak fix from the freeloaders
-Up-ports a memory leak fix related to preview mannequins.
-Also fixes the forementioned fix breaking fuzzy/sharp previews on setup.
-Also makes the fuzzy/sharp toggle button update the char setup preview.
2021-02-27 12:47:16 +02:00
Killian
81de5d28fa ITEL v2 2021-02-26 22:49:02 +00:00
Schnayy
ec94beed6b Removes ping subsystem that was breaking chat 2021-02-26 10:00:37 -05:00
Killian
687796a37d go verb yourself 2021-02-15 05:33:05 +00:00
Novacat
3d1ec8ce42 Merge pull request #9540 from VOREStation/upstream-merge-7810
[MIRROR] Excised Errant Bay Military Lore
2021-02-13 00:50:25 -05:00
TheFurryFeline
c7eb14782c No ERP -> Unset
Just feels like this would be better since having it as default might turn potential partners away if the player is unaware they can switch this to what they want. 

🆑 
tweak - Change default setting for ERP prefs to unset to encourage asking if unsure.
/🆑
2021-02-12 17:02:13 -05:00
Schnayy
92448560bb Medical Soft/Field Cap 2021-02-12 15:04:06 -05:00
Verkister
039ede55fe Merge pull request #9539 from VOREStation/upstream-merge-7813
[MIRROR] Adds proc to properly update human icon gender
2021-02-10 21:13:52 +02:00
Verkister
e7ad6fbc48 Update 03_body.dm 2021-02-10 12:14:14 +02:00
Killian
016cbb80be tgui character directory tweak 2021-02-10 02:36:05 +00:00
Verkister
b9192e59f2 Merge branch 'master' into tgui_character_directory 2021-02-09 22:18:16 +02:00
Killian
c8e633c7d5 improved trait exclusion logic 2021-02-08 07:28:30 +00:00
Verkister
c2c34b41dc Adds body shape traits and proper preview scaling
-Adds neutral height/width changing body shape traits available for all, based on the polaris modifier traits. (tall/taller/short/shorter and fat/obese/thin/thinner) The height traits are mutually exclusive only with other height traits, same with width traits so you can be extra tall and extra wide at the same time.
-Makes our mob size_multiplier stuff compatible with icon_scale_x/y stuff.
-Brings back proper tile alignment and adequate space for character previews, which now also scale correctly, and properly preview sharp/fuzzy scaling effects and the body shape traits.
2021-02-05 22:13:44 +02:00
Verkister
ac93d0e6cd Fixes the setup button 2021-01-29 20:03:31 +02:00
Verkister
7b1c399a73 Eggy reworks and fixes 2021-01-29 14:55:17 +02:00
Verkister
af25a1b592 New advanced Egg Release mechanics.
-The vore release eggs are no longer reskinned lockers, but storage items that can have their contents either dumped or pulled out, but the stuff can't be put back into a cracked shell.
-A live prey in an egg will have the egg scaled according to their size, and they can get out by resisting.
-Also now items can be egged, either one at a time or all at once. The single item eggs are scaled according to the contained item's size class and take the same amount of storage space as the item itself would.
-Full stuff eggs are a little more lenient on the size and weight, basically for the reason that one prey's full outfit could fit in one backpack sized egg rather than going full macro based on the total weight.
-Also there's a whole bunch of new egg type options and some better looking sprites coming.
-Also the new eggs can be picked up and even trash-eaten.
-The old locker eggs still exist in the code and can be spawned should anyone have a need for one.
2021-01-28 13:34:18 +02:00
H0lySquirr3l
3d58ac9f05 Update loadout_fluffitems_vr.dm 2021-01-25 13:44:09 -06:00
H0lySquirr3l
dbe94eafb6 Update loadout_fluffitems_vr.dm 2021-01-25 13:39:55 -06:00
Schnayy
3eceda5bb3 fixes some sprites, adds a thin blindfold 2021-01-24 19:34:39 -05:00
Heroman
ed7323be21 Should fix the broken species 2021-01-24 18:01:53 +10:00
Novacat
b30aa42143 Merge pull request #9544 from VOREStation/upstream-merge-7803
[MIRROR] Fixes dark click catcher
2021-01-24 01:56:58 -05:00
Heroman
2c4a82f87f Makes most neutral traits available to all species 2021-01-17 11:15:16 +10:00
Ketrai
ffc4dac425 adds pelts
ye
2021-01-10 04:12:53 +01:00
Atermonera
76ba3741b7 Fixes dark click catcher 2021-01-03 18:22:14 -05:00
Amy
3752556ceb Fixes mistakes I made adding Verie's fluff items 2021-01-02 21:53:46 -06:00
Cerebulon
4fc2884f9f Excised Errant Bay Military Lore (#7810)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Update filth.dm

why was this here oops i was on master
2021-01-01 00:40:56 -05:00
Atermonera
9f9e29d651 Adds proc to properly update human icon gender 2021-01-01 00:33:30 -05:00
Amy
354eba6ab5 adds fluff skirt outfits to loadout blacklist 2020-12-27 22:19:14 -06:00
VerySoft
92181c24db Harmony fluffstuff
https://forum.vore-station.net/viewtopic.php?f=45&t=1880
https://forum.vore-station.net/viewtopic.php?f=26&t=1881
it not approved yet but for if/when it gets so
2020-12-22 22:06:02 -05:00
lukevale
9565423d8f Adds in nickname saved to the character load selection 2020-12-17 12:31:48 -06:00
H0lySquirr3l
612c7fc000 Update loadout_fluffitems_vr.dm 2020-12-11 17:13:18 -06:00
H0lySquirr3l
4894dc0eb6 Add files via upload 2020-12-11 17:03:32 -06:00
Novacat
39fe761eee Merge pull request #9394 from VOREStation/upstream-merge-7760
[MIRROR] Adds & Upgrades a Bunch of Teshari Clothing
2020-12-04 15:06:38 -05:00
KasparoVy
fa1c991994 Reverts Most of #9312, Fixes #9394
Reverts the VR_edit versions of the clothes in PR #9312 and brings Teshari clothing in compliance with Polaris upstream
2020-12-03 22:40:02 -05:00
Killian
99c8ef8428 khi crg/civ uniforms 2020-12-02 13:15:42 +00:00
KasparoVv
0d6e6f87b2 Adds & Upgrades a Bunch of Teshari Clothing 2020-12-02 02:30:07 -05:00
Novacat
60217c38ae Merge pull request #9333 from Tenryumi/nikki-fluff
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 18:45:57 -05:00
David Winters
1469d31e99 WHO ARE YOU I AM FROM ANCIENT GREECE 2020-11-28 10:51:26 -05:00
KasparoVy
b062575363 Ports Cool Stuff from Bastion of Hestia/Vesta
Fully implements DNA-integrated secondary & tertiary colouration for ears, wings and tails.

Adds some new ears, wings, tails and markings from Hestia.

Everything working in mint condition

EVERYTHING
2020-11-21 14:57:44 -05:00
KasparoVy
b17adc6cb9 Alright I swear that's it.
Scatterbrained af.
2020-11-18 21:46:20 -05:00
KasparoVy
2b3d7ce291 It's All VR - Fixes Pathing & Comments, Adds Downstream Undercoat Resprites
That's all folks.

The updated teshari_uniform.dmi is coing to be straight up copy pasta'd to Polaris
Also moves Teshari aerogel goggles to non _vr file since that's going to Polaris
2020-11-18 21:46:20 -05:00
KasparoVy
15b09236e3 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW
All changes to eyes, gloves, suit and ties.dmi are due to be ported upstream to Polaris
The orange goggles are going to be ported to Polaris

Adds Teshari-fitted collar sprites
Adds Teshari-fitted sleek orange goggles
Adds Teshari-fitted rings
Adds better Teshari-fitted Space Suit & Helmet sprites
Adds full sets of Teshari standard & job cloaks from CitRP (different sprites than Polaris) - job cloaks can be selected as an option when selected in loadout. Captain, Psych, RD, HoS & HoP cloaks are net-new from CitRP.
Adds the dark retrowave & black + glowing Teshari cloaks from Chomp.
Adds full sets of Teshari standard & job belted cloaks from Chomp.
Adds full set of Teshari belted cloaks from Chomp.
2020-11-18 21:46:19 -05:00