Commit Graph

1127 Commits

Author SHA1 Message Date
klaasjared 56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
Aronai Sieyes 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
Casey 18fa28a431 Merge pull request #11698 from GhostActual/toolz
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
Casey c1ab2b86de Merge pull request #11643 from Verkister/patch-87
Fixes the language reset bug
2021-10-27 11:22:56 -04:00
Casey 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 Sieyes 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 Sieyes 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
Verkister 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
Ghost Actual 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 1af644bdca.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
Aronai Sieyes f0f388332f Fix merge 2021-09-27 14:10:24 -04: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
MistakeNot4892 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
MistakeNot4892 af10c9d0c9 Expands the ring selection 2021-09-05 23:29:36 -04:00
Verkister 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 Sieyes 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 Sieyes 668ffdd90d Merge pull request #11495 from VOREStation/upstream-merge-8242
[MIRROR] Adds Headset Radio Sounds
2021-08-26 13:25:20 -04:00
Aronai Sieyes 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 Actual 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
MistakeNot4892 57a1978aab Adds Qipaos 2021-08-25 23:28:10 -04:00
MistakeNot4892 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
MistakeNot4892 ac8ff7a5bd Merge pull request #8242 from Cerebulon/radiosounds
Adds Headset Radio Sounds
2021-08-25 21:45:08 -04: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
Aronai Sieyes 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
PastelPrinceDan 3741b3e7f2 fixes the hood woo yea
i forgot the fucking hoodtype var please kill me
2021-08-15 13:14:36 +01:00
Aronai Sieyes 2a0533d05f Merge pull request #11409 from VOREStation/upstream-merge-8191
[MIRROR] Adds Teshari legwraps
2021-08-15 01:09:49 -04:00
Aronai Sieyes a18e40c7ce Adds Teshari legwraps 2021-08-13 22:38:43 -04:00
Schnayy aa5742d869 Merge pull request #8201 from Cerebulon/erpking
Dethrone The ERP King
2021-08-13 18:36:37 -04:00
Hatterhat 5e2d9d8c67 huh 2021-08-08 23:31:47 -05:00
Hatterhat 7ad08b7b12 single point of failure 2021-08-08 23:07:56 -05:00
Hatterhat 974f6970a8 woo yea grey blue jackets 2021-08-08 23:02:22 -05:00
Aronai Sieyes 202c34cc93 Fixes #11254 2021-08-01 10:25:38 -04:00
Aronai Sieyes 669d23322c Change various things to subtypesof() 2021-07-20 12:54:59 -04:00
Aronai Sieyes 34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
Aronai Sieyes e691ec11dd Merge pull request #11136 from VOREStation/Arokha/synthtemp
Prevent synths from taking temp traits
2021-07-19 17:16:04 -04:00
Novacat 982d88145d Merge pull request #11142 from Heroman3003/Talonflufffix
Fixes Talon being referred to as if ITV is a company
2021-07-19 11:11:38 -04:00
Heroman cda873287c Fixes Talon being referred to as if ITV is a company 2021-07-19 14:10:32 +10:00
Aronai Sieyes 8141609589 Further block and sanitize invalid traits 2021-07-18 15:06:53 -04:00
Aronai Sieyes 25184e4af5 Fixes #11118 2021-07-18 11:42:26 -04:00