Commit Graph

34 Commits

Author SHA1 Message Date
GoldenAlpharex
6f3aaf01da Revert "[MIRROR] Ethereals no longer get the "he" pronoun accidentally [MDB IGNORE]" (#9884)
* Revert "[MIRROR] Ethereals no longer get the "he" pronoun accidentally [MDB IGNORE] (#9880)"

This reverts commit f42200feef.

* Properly reverts it, the Skyrat way
2021-12-05 10:27:36 -05:00
SkyratBot
f42200feef [MIRROR] Ethereals no longer get the "he" pronoun accidentally [MDB IGNORE] (#9880)
* Ethereals no longer get the "he" pronoun accidentally (#63221)

Character preferences now disregards the gender value if the species you're playing as is sexless
fixes #61491 (Ethereals being "He" instead of "They")

* Ethereals no longer get the "he" pronoun accidentally

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-12-05 10:00:58 -05:00
SkyratBot
af56276408 [MIRROR] makes the gradient color options not show if no gradient is selected [MDB IGNORE] (#9837)
* makes the gradient color options not show if no gradient is selected (#63169)

* makes the gradient color options not show if no gradient is selected

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
2021-12-02 22:24:13 +00:00
RatFromTheJungle
40fe2de00a [STILL NOT MODULAR] Adding Hemophages (#9681)
* Create hemophage.ts

* Update scan_gate.dm

* Update revenant_abilities.dm

* Update species.dm

* Update species.dm

* Create hemophage.dm

* Update SpeciesPage.tsx

* Update data.ts

* Update DNA.dm

* Update is_helpers.dm

* Update ScannerGate.js

* Update sensor.dm

* Update game_options.txt

* Update species.dm

* Update ScannerGate.js

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update hemophage.dm

* Update hemophage.ts

* Update hemophage.ts

* Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/species/hemophage.ts

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/species/hemophage.ts

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update hemophage.ts

* Update hemophage.dm

* Update hemophage.dm

* Update tgstation.dme

* Update hemophage.dm

* Update hemophage.dm

* dont be angry map merge bot please

* Update alcohol_reagents.dm

* Update alcohol_reagents.dm

* final fix

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-28 14:23:02 -05:00
SkyratBot
747a8273d8 [MIRROR] Gradients can now be applied to facial hair too. [MDB IGNORE] (#9719)
* Gradients can now be applied to facial hair too.

* Fixing dem conflicts

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-27 20:22:36 +00:00
SkyratBot
49d7e240bc [MIRROR] Fix vampire clan last names applying to everyone [MDB IGNORE] (#9675)
* Fix vampire clans applying to everyone (#63036)

* Fix vampire clan last names applying to everyone

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-11-24 03:34:38 +00:00
SkyratBot
6ac6dae856 [MIRROR] Fix random names breaking preferences [MDB IGNORE] (#9370)
* Fix random names breaking preferences (#62668)

The randomization (specifically from the random names secret) overrode your preferences, this fixes that.

* Fix random names breaking preferences

* Should fix the issue with that damn unit test.

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-23 13:36:22 -05:00
SkyratBot
92f2eccfea [MIRROR] de-hardcodes moth antennae preference icons [MDB IGNORE] (#9657)
* de-hardcodes moth antennae preference icons (#62888)

It just makes the preferences actually appear for downstreams who have unique moth preferences.

* de-hardcodes moth antennae preference icons

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-11-23 09:35:29 -05:00
SkyratBot
de4647c320 [MIRROR] Replaces Batform with Vampire houses [MDB IGNORE] (#9636)
* Replaces Batform with Vampire houses (#62516)

Permissions for species change

image
About The Pull Request

Goodbye batform

Hello, new preference called vampire status. Outcast vampires act just like normal, Inoculated vampires join their department under a unified "vampire house name" everyone shares.

image

image

image
Why It's Good For The Game

I've heard people complain about batform for years now, if vampires aren't gone by next halloween we can at least enjoy making them far less griefy (ruining a lot of the fun of halloween as just a dumb grief holiday) and more roleplay oriented. I don't even know why vampires got a griefy spell when they already have their main mechanic encourage randomly attacking people and stealing their blood to stay alive
Changelog

cl
del: Batform is gone!
add: ...Replaced by vampire houses as a preference. Join your department as a vampire ménage!
/cl

* Replaces Batform with Vampire houses

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-23 04:09:07 +00:00
SkyratBot
5c78cf0b49 [MIRROR] Hair gradient preference no longer shows for species that don't have hair [MDB IGNORE] (#9626)
* Hair gradient preference no longer shows for species that don't have hair (#62950)

* Hair gradient preference no longer shows for species that don't have hair

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-22 23:15:06 +00:00
Superlagg
1b427bdda1 [NON-MODULAR] Re-adds per-character PDA settings (#9453)
* Ringers work now
Added entry on the list
moved PDA colors and style to character prefs
Works as far as I can tell!

* Made requested changes
Description less overly specific and meta-referencey
Sanitized input
2021-11-16 16:34:53 -05:00
SkyratBot
196eb4354f [MIRROR] Allows any character to use the body type setting regardless of gender [MDB IGNORE] (#9426)
* Allows any character to use the body type setting regardless of gender

* Feex

* Another feex

* Avoiding savefile corruption

* Shut up linters

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-14 15:18:56 -05:00
SkyratBot
554703cdda [MIRROR] Fixes numeric prefs not working with TGUI dropdowns that might return a string instead of a number [MDB IGNORE] (#9317)
* Fixes numeric prefs not working with TGUI dropdowns that might return a string instead of a number (#62653)

* Fixes numeric prefs not working with TGUI dropdowns that might return a string instead of a number

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-08 17:56:20 -05:00
Seris02
99a6fe31f2 [SEMI-MODULAR?][TESTMERGE FIRST] Glow in the dark markings/bodyparts/eyes (#8960)
* FUCKIN WOOO

* much better

* yesssssss

* yeetus deletus the merge conflictus dies

* fug that was an oops

* better

* linters are weird

* woops I erased tesh tails

* better

* wingfix

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-11-06 22:41:29 -04:00
GoldenAlpharex
7c175b2da5 Fixing the Veteran-only quirks (#9129)
* Adding a newline so it doesn't mess up with Manage Player Ranks for downstreams

* Makes Veteran-only Quirks work, makes them display something in the Quirks menu too.

* Fixing linters

* There it goes, still kinda crazy that it still worked, I was lucky.
2021-10-29 21:07:53 +01:00
SkyratBot
bf30153a12 [MIRROR] Few minor runtime fixes [MDB IGNORE] (#9116)
* Few minor runtime fixes

* Fixing merge conflicts

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-10-29 11:35:52 -04:00
SkyratBot
79f51c06b1 [MIRROR] Nearsighted quirk lets you pick the look of the glasses you spawn with [MDB IGNORE] (#8929)
* Nearsighted quirk lets you pick the look of the glasses you spawn with (#62145)

expansion: Nearsighter quirk now lets you pick the look of your prescription glasses from the character preference menu
imageadd: Added thin prescription glasses

* Nearsighted quirk lets you pick the look of the glasses you spawn with

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-23 00:35:04 +01:00
Gandalf
90d350b867 Update quirks.dm 2021-10-20 16:49:21 +01:00
Gandalf
73a95a4161 Update quirks.dm 2021-10-20 00:10:10 +01:00
Gandalf
d962be98a9 Makes oversized VC only (#8920)
* Yes.

* oops

* Update _quirk.dm

* Update quirks.dm

* Update code/modules/client/preferences/middleware/quirks.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update veteran_players.dm

* Avoiding possible runtimes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-10-18 21:42:28 -04:00
SkyratBot
f0db07b17d [MIRROR] makes it so the sanitize_hexcolors' default is 6 characters rather than 3 and gets rid of color_legacy [MDB IGNORE] (#8840)
* makes it so the sanitize_hexcolors' default is 6 characters rather than 3 and gets rid of color_legacy

* Feex

* Feex some more

* Final feex

* Please no more I'm tired

* <<<<<<< HEAD

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-17 00:30:28 -04:00
SkyratBot
3fce7a4cb4 [MIRROR] Moves hair gradients to the preferences menu [MDB IGNORE] (#8847)
* Moves hair gradients to the preferences menu (#62102)

* Hmm yes.

* let's not make everyone have rainbow hair

* Update basic.dm

* Undoes the dyekit removal!

* Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx

* Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx

* Update basic.dm

* Moves hair gradients to the preferences menu

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-16 01:28:26 +01:00
Gandalf
b16b79091a Updated OGI compatibility with IMENU (#8807)
* Updated OGI compatibility with IMENU

* Update interaction_menu.dm

* Update interaction_menu.dm

* Update interaction_menu.dm

* Update interaction_menu.dm
2021-10-14 21:20:09 +01:00
SkyratBot
fa519bdde3 [MIRROR] cleanup _HELPERS/_lists.dm and all the necessary files [MDB IGNORE] (#8783)
* cleanup _HELPERS/_lists.dm and all the necessary files

* Epbic

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-13 21:07:35 +01:00
Lyroy
99893bd8a8 [SEMI-MODULAR] Brings back custom Ash Walkers and Primal Podpeople, also fixes job banned species checks (#8665)
* initial commit

* whoops hahah you don't need that comment

* species check on the prefs menu

* species check actually works now, podpeople quirks

* goof was right
2021-10-13 20:32:37 +01:00
SkyratBot
a210a8b479 [MIRROR] Add reset keybindings button, fix scaling on tabbed list buttons [MDB IGNORE] (#8740)
* Add reset keybindings button (#61942)

* Add reset keybindings button, fix scaling on tabbed list buttons

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-10-10 15:38:25 +01:00
SkyratBot
c10be1344d [MIRROR] Fixes default FPS and makes it apply to new players [MDB IGNORE] (#8687)
* Fixes default FPS and makes it apply to new players (#61957)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Fixes default FPS and makes it apply to new players

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-10-08 08:22:12 -04:00
CalamaBanana
63b945ff1f Fixes missing color for undershirt/socks (#8548)
* Fixes missing color for undershirt/socks

Added color choice to undershirt and socks selection.

* Added SKYRAT EDITs

Added SKYRAT EDITs

* Moved a file to the masterfiles

Moved a file to the masterfiles
2021-10-03 23:36:28 +01:00
SkyratBot
84d0c39b6b [MIRROR] Add preference to disable deadmin preferences in CentCom [MDB IGNORE] (#8515)
* Add preference to disable deadmin preferences in CentCom (#61751)

* Add preference to disable deadmin preferences in CentCom

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-10-01 03:03:48 +01:00
Iamgoofball
68e84c432e Skyrat Prefs Menu: Fixing everything to work correctly (#8350)
* Skyrat Prefs Menu: Fixing everything to work correctly

* whoops haha

* Examine menu!

* haha whoops

* Mutant Parts in tgui prefs

* fug

* LIMBS, MARKINGS, LANGUAGES

* EEEE FUCK

* Update tgui_prefs_migration.dm

* Update tgui_prefs_migration.dm

* FUCK

* Proper migration

* Update preferences.dm

* Final fixes for this shit

* Update LoadoutManager.js

* adds cursed shit

* e

* Update preferences.dm

* fixes examine panel

* adds // SKYRAT EDIT to bullshit

* sabshesgawgzxghsv

* wargesthgeargfea

* stegresgdytfrw

* EEE

* Update species_features.tsx

* EEE

* Update cursed_shit.tsx

* fixed taurs

* body size is now a 0.01 step

* Fixes some bugs

* Some required changes.

* Update examine.dm

* actually nekked

* Update code/modules/client/preferences/middleware/jobs.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/client/preferences/middleware/limbs_and_markings.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/client/preferences/middleware/limbs_and_markings.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/modules/client/preferences/middleware/limbs_and_markings.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/loadouts/loadout_ui/loadout_manager.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/species_features.tsx

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* More fixes

* Donator items no show

* EEE

* fixes rapier sheaths

* gender =/= body type

* Loadout fixes

* Skintone

* Update skin_tone.dm

* Slick it up

* Update loadout_manager.dm

* Fixes typing indicator

* SSD indicator fixes

* fixes

* oops

* Fix this.

* Fixing the Occupations Menu

* Fixing NT Rep's alt-titles

* Update tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/janitor.ts

Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>

* Update code/controllers/subsystem/language.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/research_director.ts

Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>

Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>
2021-09-29 15:24:30 +01:00
GemInee
ae2111bfc0 organic ui fix (#8457)
* organic ui fix

Reimplementing UI fixes

* fuc u, i won

* some skyrat buerocracy stuff

Co-authored-by: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
2021-09-28 18:05:06 +01:00
Gandalf
88485243c2 Update species.dm (#8372) 2021-09-24 22:11:56 +01:00
SkyratBot
98bf39bf52 Fix quirks list in preferences menu being empty before SSquirks (#8327)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-23 02:39:47 +01:00
SkyratBot
124ddd7cca [MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend

* nah, we dont need to ping those people

* trying to remove the funny stuff

* unmodularizing this

* prefs reset

* this may need to be reverted, who knows

* okay, this part

* perhaps

* EEEEEEEEE

* unsanitary

* E

* Stage 1 + loadout system

* more fixes

* E

* I mean, it launches?

* More fixes and reorganisation

* E

* customisation code is spaget.

* disable ERP prefs

* Update erp_preferences.dm

* Update erp_preferences.dm

* E

* Slowly getting there

* It may be time for help :)

* tri...colors... help

* preferences now pass preferences

* Update dna.dm

* Fuck this man

* missing savefile return, set_species works, removed dumb stuff from updateappearance

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224

* https://github.com/tgstation/tgstation/pull/61519

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278

* e

* le butonAZARAK HELLO

* hhh

* Proper recognition where it's due, MrMelbert!

* EEEE

* examine block

* Better gen hit sounds from whitedream

* final loadout touches, more bug fixes im sure to come

* i said there would be bugfixes

* Update LoadoutManager.js

* Missing preferences in the html menu

* LIVE TESTING PHASE BABY

* Update LoadoutManager.js

* EEE

* LAUNCH TEST FIRE

* Update job.dm

* Update new_player.dm

* 50gb DAY ONE PATCH

* EEE

* Update preferences.dm

* buggle fixes

* Update examine.dm

* >LOOC starts on

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-09-23 00:40:37 +01:00