Commit Graph

1044 Commits

Author SHA1 Message Date
Unknown 21d5da0f1b Manual port Polaris Fixes
Ports https://github.com/PolarisSS13/Polaris/pull/8099 and https://github.com/PolarisSS13/Polaris/pull/8101
2021-05-22 16:02:13 -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
Aronai Sieyes cd16f636e9 Merge branch 'master' into Arokha/removeoldnifmenu 2021-05-12 10:12:17 -04:00
Aronai Sieyes d712732f7a Fix mystery characters in character setup screen 2021-05-11 23:43:35 -04:00
Aronai Sieyes 327cb7219f Update emotes at the end of setting up body 2021-05-11 21:06:19 -04: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
Unknown e627c03ff0 Fixes Wing/Tail/Ear Sanitation
Basically it forgot to account for species that can select their icon base.
2021-05-10 10:00:41 -04:00
Atermonera a347843d02 Merge pull request #8064 from MistakeNot4892/styles
Fixes Virgo #10254.
2021-05-07 03:16:50 -04:00
Novacat e861d8707f Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 10:42:19 -04:00
Novacat 5c29ed9a57 Update 03_body.dm 2021-05-02 23:58:07 -04:00
Atermonera f0913e3013 Body style selection and sanitizing refactor. 2021-05-02 23:57:07 -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
Novacat 7ee3781614 Merge pull request #10219 from VOREStation/upstream-merge-8055
[MIRROR] Adds config option to control loadout whitelist strictness
2021-04-28 12:45:38 -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
Unknown 56626c527f Compatibility Fixes 2021-04-28 11:43:26 -04:00
Atermonera 0956e2794e Sanitizes languages, ears/wings/tail prefs on login 2021-04-27 16:48:26 -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
Novacat 28e0fa6296 Merge pull request #10127 from Nyksia/species-cleanup
Species cleanup
2021-04-10 23:04:07 -04:00
David Winters 8b70c010c6 Merge branch 'master' into cigs 2021-04-10 22:38:54 -04:00
Nyks 805d33f874 Species code clean-up 2021-04-11 02:22:06 +03: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
Aronai Sieyes 081b100e10 Update resize pref and some resizing code 2021-04-07 15:15:51 -04:00
David Winters ddf09d50cc cigs 2021-04-05 18:19:58 -04:00
Atermonera c426988728 Merge pull request #8006 from MistakeNot4892/teshpets
Prevented Teshari from selecting positronic brains.
2021-04-02 03:54:52 -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