Commit Graph

558 Commits

Author SHA1 Message Date
Novacat
7f74202862 Merge pull request #9940 from Meghan-Rossi/talontweaks
Talon tweaks
2021-03-13 20:58:53 -05:00
TheFurryFeline
47652a7fff Restore VS edit of tracking implant
Title.

🆑 
tweak - Fixes tracking implant cost to 0, not 10.
/🆑
2021-03-13 20:24:44 -05:00
Meghan-Rossi
f716797a7f Talon tweaks
🆑
rscadd - Added copper to the talon workshop.
rscadd - Added a stunbaton to the talon guard's locker.
rscadd - Talon jobs can now take some role restricted accessories in the loadout.
rscadd - The Talon Pilot laptop now comes with the ship navigation screen preinstalled.
bugfix - Talon can now access their own engi-vend.
tweak - Talon Pilot ids now show the full job title instead of just 'Pilot'.
/🆑
2021-03-13 21:58:13 +00:00
Unknown
265134ee6a Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 15:04:58 -05:00
David Winters
8cd54d4794 oversized t-shirt + chiton fix 2021-03-11 10:07:24 -05:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Novacat
6d032405d8 Merge pull request #9899 from VOREStation/upstream-merge-7966
[MIRROR] Yet another clothing PR
2021-03-10 14:40:16 -05:00
Atermonera
a8409a3e1e Yet another clothing PR 2021-03-10 14:30:44 -05:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Schnayy
24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair
Adds some new wheelchair types
2021-03-09 01:14:49 -05:00
Novacat
dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 11:52:46 -05:00
Novacat
3d7ccffa0c Update loadout_utility.dm 2021-03-08 11:04:02 -05:00
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
Heroman
5702604b41 Redoes the PR, adds HYPER suit instead 2021-03-08 10:11:10 +10:00
Heroman
2ae3f959b3 gives bluespace jumpsuit a loadout cost. 2021-03-07 14:17:53 +10:00
Heroman
ecb982e6e9 Reworks bluespace suit, adds redspace suit 2021-03-07 14:08:25 +10:00
Unknown
973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -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
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
Schnayy
92448560bb Medical Soft/Field Cap 2021-02-12 15:04:06 -05: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
Ketrai
ffc4dac425 adds pelts
ye
2021-01-10 04:12:53 +01: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
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
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
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
Amy
5d0d3bb38d Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff 2020-11-14 12:55:04 -06:00
Amy
ae991c1fb2 Oh god it actually works yes but now it doesn't render in your icons WHY 2020-11-12 17:12:36 -06:00
ArgobargSoup
45d6a36fb0 Adds the entry for Felina's witch hat to fluff item loadout 2020-11-09 22:32:09 -08:00
Atermonera
9a596f0e45 Merge pull request #7751 from Greenjoe12345/clothesporting
Ports some clothing from uristcode
2020-11-07 15:32:07 -05:00
Schnayy
8f9edf0e57 5 new clothes & 1 headdress (#7733) 2020-10-17 06:15:54 -04:00
Heroman
7d1828f2b4 Fixes = typo 2020-10-04 19:50:30 +10:00
Heroman
bd8e240211 Standartizes gear_tweaks on _vr only items 2020-10-04 19:47:42 +10:00
Riley
ec42a286d0 Clara's Vacuum Flask
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
2020-09-29 18:01:07 -04:00
Heroman
c9a019ee01 Adds Charles' Tophat 2020-09-28 04:54:23 +10:00
Novacat
65c677ba30 Merge pull request #9088 from ShadowLarkens/shadow_fluff
Add Shadow Larkens laptop fluff item
2020-09-26 21:16:21 -04:00
Atermonera
123a0fd115 Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch
Teshari sprites and white eyepatch
2020-09-26 16:58:44 -04:00