Commit Graph

597 Commits

Author SHA1 Message Date
Novacat
89ed203456 Merge pull request #10635 from PastelPrinceDan/pandoracoat
Pandora029 fluff item
2021-06-20 13:39:20 -04:00
klaasjared
bc497ca372 Adds EVERYTHING
I never did any other commits so here is all the code stuffs
2021-06-16 02:09:29 -04:00
PastelPrinceDan
d9e3b432dd removes lines 2021-06-14 23:06:25 +01:00
klaasjared
313c3a7a2a Adds in fix and comments
Fixes loadout to include new explo duffle and adds organizational comments to `backpack_vr.dm` to make it look nice.
2021-06-09 06:36:57 -04:00
Lunaball
fe3f63b423 Adding an approved custom item
Adds Antoinette's ritual supplies. One glass knife, one harness, one bottle of ground poppy reagents.
2021-05-18 13:13:47 -06:00
Novacat
a17321ae02 Merge branch 'master' into wintercoats 2021-05-17 18:28:41 -04:00
Killian
74612eaedd loadout tweaks 2021-05-17 00:24:34 +01:00
TheFurryFeline
93b8773530 AR Visor
Close https://github.com/CHOMPStation2/CHOMPStation2/issues/96

This adds something from pre-rebase Chompstation I always meant to add back in. Yay for motivation! Note: this is purely a cosmetic addition and a variation of a regular pair of AR glasses but you can change the tint in Char Setup. :3
2021-05-15 08:59:17 -04:00
PastelPrinceDan
b6e92da360 more winter coats
adds winter coats, moves some that were in weird files
2021-05-14 10:37:19 +01:00
Unknown
4fdf2a1897 Fluff items
https://forum.vore-station.net/viewtopic.php?f=27&t=1960

https://forum.vore-station.net/viewtopic.php?f=27&t=1958
2021-05-10 17:17:56 -04:00
David Winters
0d224d9d00 Update loadout_general_vr.dm 2021-04-29 19:58:41 -04:00
David Winters
4415f05959 Merge branch 'master' into toys 2021-04-29 14:35:52 -04:00
Unknown
7137e0aa84 Compile fix 2021-04-28 12:36:31 -04:00
Unknown
20022b560b Compatibility Fixes 2021-04-28 11:47:17 -04:00
David Winters
d0a8ce7ca3 file loss recovery 2021-04-27 06:41:57 -04:00
Atermonera
74902a6544 Adds config option to control loadout whitelist strictness 2021-04-27 03:16:06 -04:00
Novacat
8b8c3c55eb Merge pull request #10217 from ResidentCody/Personal-Fork
Add LUNA's Medals
2021-04-27 00:18:59 -04:00
ResidentCody
c312aac93c Update loadout_fluffitems_vr.dm 2021-04-26 22:02:02 -06:00
Little-119
7f961dd4aa Update loadout_fluffitems_vr.dm 2021-04-26 19:47:06 -04:00
Heroman
2bee350ae3 Both fixes and comments out WL check 2021-04-27 04:36:32 +10:00
Atermonera
48a6baff4b Merge pull request #8047 from Verkister/patch-70
Makes xenowear species WL check for species instead of ckey
2021-04-25 14:24:51 -04:00
Novacat
ed95d17304 Merge pull request #10176 from Novacat/nova-basicfixes
Updates Medals (again)
2021-04-20 18:48:26 -04:00
Unknown
f69d40fc56 Updates Medals (again)
Astra, Ascian, and Lucky were nominated for a Unity medal as well. This applies it.
2021-04-20 18:37:48 -04:00
David Winters
d20766da41 fix 2021-04-20 16:53:43 -04:00
Unknown
d7f34c1ce3 Fixes indentation errors 2021-04-20 12:36:46 -04:00
Unknown
2a96ff85a7 More updates 2021-04-20 12:32:58 -04:00
Unknown
c6320456b4 Whitelist Updates 2021-04-18 15:44:24 -04:00
Novacat
724e43cf54 Merge pull request #10147 from dwinters99/cigs
AlFalah fluff item
2021-04-12 13:27:32 -04:00
David Winters
2468f31cbb oops 2021-04-11 18:35:31 -04:00
David Winters
e443ea25b0 fluff item 2021-04-11 00:11:53 -04:00
David Winters
8b70c010c6 Merge branch 'master' into cigs 2021-04-10 22:38:54 -04:00
David Winters
7dc38e9650 forgot to change the ckey 2021-04-10 19:11:30 -04:00
David Winters
02bef2c40e fluff item 2021-04-10 03:56:32 -04:00
Aronai Sieyes
4690411915 Remove unnecessary 'signatures' 2021-04-08 12:39:14 -04:00
David Winters
ddf09d50cc cigs 2021-04-05 18:19:58 -04:00
Novacat
fc0ed975c5 Merge pull request #10029 from Very-Soft/morealtids
MORE ALT ID STUFF
2021-03-28 19:58:35 -04:00
VerySoft
da6f853210 MORE ALT ID STUFF
So basically I made one for all the station jobs, and then made one that when you use it, will become whatever job you are when you use it the first time. I added these to the loadout under utility as contractor identification cards!

I also did the same thing for the ITG IDs, but I did not put them on the loadout. People can fluff for them if they want to though! ITG is just a little more stringent in its hiring process than NT is.

I ALSO put in tons of pieces (which I used to make most of these) so that if someone wants to make more of them, or modularize some of them for whatever, they can! There's some alternative icon types and stuff in here too for making IDs for factions that don't exist or whatever! :0

I also removed Harmony's fluff ID and replaced it with the polymorphic ITG ID, since it's effectively the same thing but more generalized.
2021-03-27 20:55:16 -04:00
Atermonera
c586a83071 Repathed/renamed seromi to teshari. 2021-03-26 15:38:02 -04:00
Heroman
5faf57d8e6 Also refactors them all a lil. 2021-03-24 15:47:10 +10:00
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