Commit Graph
1815 Commits
Author SHA1 Message Date
izac112 c9b2f560d9 Station Engineer = Engineer 2021-11-07 12:41:18 +01:00
izac112 261609b060 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-11-07 12:32:36 +01:00
CaseyandGitHub 0502970c3f Merge pull request #11752 from Heroman3003/jobstuff2
Renames Engineer, new alt-titles for Stellar Delight
2021-11-06 03:44:47 -04:00
izac112 560d8d2dd6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-11-04 12:28:11 +01:00
Hatterhat dc1559a150 gaiter 2 2021-11-02 19:06:11 -05:00
Heroman dbe9387f5f Renames Engineer, new alt-titles for Stellar Delight 2021-11-02 19:56:49 +10:00
izac112 a274077bfa Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-10-28 21:04:37 +02:00
klaasjared 56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
Aronai SieyesandGitHub a826bcd330 Merge pull request #11712 from KillianKirilenko/kk-misc2
Customverb tweak
2021-10-27 14:17:35 -04:00
PastelPrinceDan 86627bfa9c no conflicts this time please, 2021-10-27 18:27:30 +01:00
CaseyandGitHub 18fa28a431 Merge pull request #11698 from GhostActual/toolz
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
CaseyandGitHub c1ab2b86de Merge pull request #11643 from Verkister/patch-87
Fixes the language reset bug
2021-10-27 11:22:56 -04:00
CaseyandGitHub 086d348e2f Merge pull request #11642 from PastelPrinceDan/mask
paper masks, emotional mask
2021-10-27 11:22:30 -04:00
Killian d8385d8899 customverb tweak
enforces lowercase for custom verbs
2021-10-27 10:02:00 +01:00
Aronai SieyesandGitHub b9ba661b8b Merge pull request #11603 from VOREStation/upstream-merge-8253
[MIRROR] By-species age restrictions
2021-10-24 20:36:41 -04:00
klaasjared fd2032bec7 Adds in flashlights from #11488 2021-10-23 00:10:33 -04:00
Aronai SieyesandGitHub d85b806091 Merge pull request #11572 from VOREStation/upstream-merge-8272
[MIRROR] Expands the ring selection
2021-10-22 14:39:18 -04:00
PastelPrinceDan e34f8e6414 joy mask 2021-10-01 00:06:45 +01:00
VerkisterandGitHub 62b5628417 Probably fixes the language reset bug
Looks like the despawn persistence settings have a tendency to hit that save_character button after the victim has already disconnected, which would lead into complications right here because the language whitelist check will automatically fail when fed a null in the client's place.
2021-10-01 00:01:06 +03:00
PastelPrinceDan 1742cf21d4 masks woo
papered masks :)
2021-09-30 21:33:24 +01:00
izac112 84b075457b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-09-29 23:09:10 +02:00
Ghost ActualandGitHub 0085a5bd10 Adds more clothing from Polaris and various sources (#11546)
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdcab78018aa73525125b32e522d08db41.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
Aronai Sieyes f0f388332f Fix merge 2021-09-27 14:10:24 -04:00
izac112 c0adc55b4f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-09-25 15:15:05 +02:00
Rykka e7a0ef3a26 Fixes Belches so they're enabled/audible by default
My bad, headache-brain misread the pref.
2021-09-24 15:36:43 -07:00
Rykka a346a3a9f7 Adds audible belching preference toggle, makes belch emote respect it
Preferences can now handle a list being passed to them, and will require all items in the list to be true. Singular datums work to preserve legacy behavior.

Audible belching will REQUIRE "Emote Noises" and "Audible Belching" preferences to be enabled.

Figured there'd be a potential shitstorm, and honestly adding the preference was easier than I thought.

This will work if for w/e reason you decide to add farting noises - a simple pref toggle, and bingo.

Etc etc.

<3
2021-09-24 15:27:25 -07:00
izac112 baf5a6a16f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-09-24 12:10:50 +02:00
MistakeNot4892andVirgoBot 3ab7de5be2 By-species age restrictions 2021-09-17 10:14:40 -04:00
PastelPrinceDan 6cd28d62ac woo yeah overalls 2021-09-14 02:41:15 +01:00
MistakeNot4892andVirgoBot af10c9d0c9 Expands the ring selection 2021-09-05 23:29:36 -04:00
izac112 f3c88225ce Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-29 10:22:30 +02:00
VerkisterandGitHub 865d117901 Fixes unresetable loadout name/desc gear tweaks
The loadout expects a text input in order to apply changes and empty input sanitizes into no input.
2021-08-27 16:21:51 +03:00
Aronai SieyesandGitHub cdd149e2f3 Merge pull request #11502 from VOREStation/upstream-merge-8234
[MIRROR] Adds Qipaos
2021-08-26 16:42:07 -04:00
Aronai Sieyes ff21e088d8 Mix qipao in with ours 2021-08-26 16:27:46 -04:00
Aronai SieyesandGitHub 668ffdd90d Merge pull request #11495 from VOREStation/upstream-merge-8242
[MIRROR] Adds Headset Radio Sounds
2021-08-26 13:25:20 -04:00
Aronai SieyesandGitHub d30f425ec5 Merge pull request #11500 from VOREStation/upstream-merge-8209
[MIRROR] Prevents Pop-up for Already Seen Lore News
2021-08-26 12:56:34 -04:00
Ghost ActualandGitHub 4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
MistakeNot4892andVirgoBot 57a1978aab Adds Qipaos 2021-08-25 23:28:10 -04:00
MistakeNot4892andVirgoBot 9f4f996b19 Merge pull request #8209 from Cerebulon/news_popup
Prevents Pop-up for Already Seen Lore News
2021-08-25 22:34:44 -04:00
MistakeNot4892andVirgoBot ac8ff7a5bd Merge pull request #8242 from Cerebulon/radiosounds
Adds Headset Radio Sounds
2021-08-25 21:45:08 -04:00
izac112 54c11f6f38 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-23 17:35:57 +02:00
PastelPrinceDan bd99ec4dc3 changes role name aeaueueuae 2021-08-23 03:13:20 +01:00
PastelPrinceDan 0981f9d1d3 more fixes grr i hate / 2021-08-22 05:22:19 +01:00
PastelPrinceDan ccb6a7cb17 woo yeah fix 2021-08-22 05:18:46 +01:00
PastelPrinceDan ea8bc0f300 clo tth ee s 2021-08-22 03:51:25 +01:00
izac112 2aed1cd5c1 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-20 15:58:41 +02:00
Aronai SieyesandGitHub d8537ad704 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-19 12:20:09 -04:00
PastelPrinceDan 60324d8ce8 labbed coat 2021-08-17 15:38:15 +01:00
izac112 06528b0674 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-16 21:05:37 +02:00
PastelPrinceDan 3741b3e7f2 fixes the hood woo yea
i forgot the fucking hoodtype var please kill me
2021-08-15 13:14:36 +01:00