Commit Graph

39 Commits

Author SHA1 Message Date
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
SkyratBot
e510e35167 [MIRROR] [READY] Adds memory system, and engraving walls with chisels (#8066)
* [READY] Adds memory system, and engraving walls with chisels

* EEE

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:36:51 +01:00
SkyratBot
701da750f2 [MIRROR] kills 4 object definitions that are inside of proc arguments (#7987)
* kills 4 object definitions that are inside of proc arguments (#61152)

thanks to putnam for reporting this in coderbus
/obj/machinery/smartfridge/drying_rack/load(/obj/item/dried_object)
looks pretty harmless right? youd think that this would make a proc argument called dried_object of type /obj/item but no, this defines a new /obj/item class definition called dried_object with zero changes from /obj/item

you can use this to do weird things, like /obj/machinery/smartfridge/drying_rack/load(/obj/item/var/dried_object = 3)
creates a new var on /obj/item called dried_object and is very cursed
gets rid of 4 of these abominations, they dont seem to have caused any bugs except for maybe behavior that relies on typesof(/some/path)

* kills 4 object definitions that are inside of proc arguments

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-09-05 22:54:54 +01:00
SkyratBot
437d44ea14 [MIRROR] Fixes traits added by quirks not being removed on remove_from_current_holder (#7777)
* forcepush from master because it's a webedit (#60984)

* Fixes traits added by quirks not being removed on `remove_from_current_holder`

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-25 20:34:23 -04:00
SkyratBot
7a1d3700bb [MIRROR] Drugs of the 26th century. Three new hella rad drugs, one less lame drug and more! (#7481)
* Drugs of the 26th century. Three new hella rad drugs, one less lame drug and more!

* Update traits.dm

* Update maint_loot_trash.dm

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:52:58 +01:00
SkyratBot
8252d0550e [MIRROR] Food preferences quirks are no longer broken by species change. (#7521)
* Food preferences quirks are no longer broken by species change. (#60582)

Added signal procs for species change to these quirks.

* Food preferences quirks are no longer broken by species change.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-12 22:50:27 +01:00
jjpark-kb
3b278f201c species id defines (#7466) 2021-08-08 22:05:10 +01:00
SkyratBot
4f92744cd7 [MIRROR] Removes an unused trait. Adds another to the traits global list. (#7339)
* Removes an unused trait. Adds another to the traits global list. (#60584)

Drunk healing is handled by the quirk itself. The trait is pointless.
I forgot add the uncatchable trait to the global list for admin shenanigeans.

* Removes an unused trait. Adds another to the traits global list.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-03 20:05:03 +01:00
SkyratBot
227b722820 [MIRROR] Job refactor: strings to references and typepaths [This could seriously break things :)] (#7006)
* Job refactor: strings to references and typepaths

* 0

* holy fuck

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 21:12:42 +01:00
SkyratBot
0dfeeceeca [MIRROR] Fixes a null to_chat runtime (#7052)
* Fixes a null to_chat runtime (#60337)

* Fixes a null to_chat runtime

Co-authored-by: Rohesie <rohesie@gmail.com>
2021-07-26 15:41:13 +01:00
Chloe
e2e90e9a1f [NONMODULAR] [READY] Tweaks the cost of a few positive quirks (#6741)
* Ae

* Update code/datums/quirks/good.dm

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

* Update code/datums/quirks/good.dm

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

* Update code/datums/quirks/good.dm

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

* Update good.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-07-10 23:15:11 +01:00
SkyratBot
0860127055 [MIRROR] Fixes minor quirk runtime. (#6589)
* Fixes minor quirk runtime. (#59870)

* Fixes minor quirk runtime.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2021-06-29 20:30:44 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
ab709c8dba [MIRROR] Refactors quirk code. (#6303)
* Refactors quirk code.

* Update neutral.dm

* 0

* Update neutral.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-15 23:48:10 +01:00
SkyratBot
52631dd7db [MIRROR] Ported hair gradients from TGMC. (#6156)
* Ported hair gradients from TGMC. (#59435)

* Ported hair gradients from TGMC.

* Removed preferences. Added hair spray. Added the colorist quirk.

* Adds 2 new longer fade variants

* Added to vendor. Added to goodies.

* Added the sprite for the spray.

* Grammar!

* Update code/modules/mob/living/carbon/human/species.dm

Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>

* Doccing and newline.

* Reviewies concerns adressed.

* Update code/modules/mob/living/carbon/human/human_defines.dm

Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>

Co-authored-by: NamelessFairy <40036527+NamelessFairy@ users.noreply.github.com>
Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>

* Ported hair gradients from TGMC.

* Mirror!

Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
Co-authored-by: NamelessFairy <40036527+NamelessFairy@ users.noreply.github.com>
Co-authored-by: Emmett Gaines <ninjanomnom@ gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 13:03:03 +12:00
SkyratBot
4839c5f8ea [MIRROR] [READY]Updates knockoff component and adds it to prescription glasses (#5978)
* [READY]Updates knockoff component and adds it to prescription glasses (#59006)

* [READY]Updates knockoff component and adds it to prescription glasses

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
2021-05-27 00:30:06 +01:00
SkyratBot
583d5dc551 [MIRROR] Med record quirk fix (#5804)
* Med record quirk fix (#59150)

* Med record quirk fix

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-05-20 22:31:19 +01:00
SkyratBot
8a7c02582b [MIRROR] Social Anxiety rework (#5558)
* Social Anxiety rework (#58721)

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* Social Anxiety rework

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>
2021-05-08 13:44:46 +01:00
SkyratBot
b818ea9a32 [MIRROR] Fixes bitwise flag negation errors (#5466)
* Fixes bitwise flag negation errors. (#58870)

These have been in the codebase for many years. Love, ZeWaka

* Fixes bitwise flag negation errors

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2021-05-05 09:59:02 +01:00
SkyratBot
9bf108236a [MIRROR] Fix mindbreaker toxin not completely stopping Reality Dissociation Syndrome (#5203)
* Make mindbreaker cure RDS (#58671)

Currently, mindbreaker toxin is supposed to suppress hallucinations, but the reagent itself still applies hallucination to the user which is counted towards handling hallucinations before it gets purged by the quirk.

It's annoying that the one thing advertised that should fix hallucinations with RDS doesn't work.

* Fix mindbreaker toxin not completely stopping Reality Dissociation Syndrome

Co-authored-by: Urumasi <Urumasi@email.cz>
2021-04-26 11:58:28 +01:00
SkyratBot
e581359337 [MIRROR] Nerfs addiction withdrawal time (#4915)
* Nerfs addiction withdrawal time (#58172)

Currently takes 1 second before withdrawal starts, which is enough to start withdrawal while still using the drug. I changed it to 1 minute before you need your fix again (old addiction was 30 seconds but could be microdosed).

Also buffed junkie pills to 3u and nerfed addiction requirement to 1u, from 2u (effctively still 2u since addiction tends to check after the 2u has already been metabolized).

Also clears disgust from opiods after quenching your addiction, because otherwise you're gonna spent the next 20 minutes being vomitlocked in place

* Nerfs addiction withdrawal time

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-04-15 16:21:49 +01:00
Azarak
85b5cbc378 cultures and languages (#4647)
* cultures and languages

* botanist fix

* missing languages

* make sure new saves from scratch get a species set correctly

* Update preferences.dm

* Update new_player.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-10 18:30:32 +01:00
SkyratBot
e98da90b77 [MIRROR] Making blood less frustrating (#4086)
* Making blood less frustrating (#57085)

Two changes.

1. If a splatter of blood isn't bloody enough, the character will not get bloody shoes.

2. Characters with light steps trait won't get bloody clothes if they step on a bloody tile without shoes.

3. added: Blood dries over time. Usually, 3 or 6 minutes. If a splatter is big enough, it can stay wet up to 15 minutes.

Why It's Good For The Game

The entire crew won't have bloody shoes anymore.
Less time wasted looking for showers or sinks to wash their shoes after stepping on a near invisible blood decal.
Characters without shoes (or who don't want to get their clothes bloody after taking them off) will get more use from a near useless trait.
Changelog

cl
qol: Blood splatters only make your shoes or feet bloody if the tile is bloody enough,
qol: Light steps trait prevents clothing from being covered in blood if you step on a bloody tile with your shoes off.
add: Blood dries over time. Usually, 3 or 6 minutes. If a splatter is big enough, it can stay wet up to 15 minutes.
/cl

(grammaticly impoved by @ maxymax13)

* Making blood less frustrating

Co-authored-by: Kush1Push1 <78963858+Kush1Push1@users.noreply.github.com>
2021-03-12 00:42:03 +00:00
SkyratBot
68b06637e1 [MIRROR] Moves heirloom lists to job/species datums (#3773)
* Moves heirloom lists to job/species datums

* Revert "Merge branch 'master' into upstream-merge-57329"

This reverts commit dde12e8a1bb916f4e152925c181d006210402423, reversing
changes made to 1994fc1ee357824519f1b3071e774f6700e99c62.

* Revert "Revert "Merge branch 'master' into upstream-merge-57329""

This reverts commit 3d7c92afc1b92ab4d70c456f06f24d3213324338.

* a

* a

* Update chief_medical_officer.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 18:59:14 +00:00
SkyratBot
0e8d991f5e [MIRROR] Poor Aim now gives you Stormtrooper Aim. (#3691)
* Poor Aim now gives you Stormtrooper Aim. (#56511)

* Poor Aim now gives you Stormtrooper Aim.

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
2021-02-27 12:36:25 +00:00
SkyratBot
c1f1a7c2cf [MIRROR] Stops histamine and toxin damage from being applied to allergy sufferers while in stasis. (#3682)
* Stop allergy effects while in stasis (#57188)

Allergy sufferers will no longer accumulate histamine and die on the
stasis bed while in stasis.

* Stops histamine and toxin damage from being applied to allergy sufferers while in stasis.

Co-authored-by: prodirus <44090982+prodirus@users.noreply.github.com>
2021-02-26 16:42:12 +00:00
SkyratBot
d0dc199815 [MIRROR] /mob/living/proc/Life(delta_time) (#3509)
* /mob/living/proc/Life(delta_time)

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:55:52 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
3b85cf1430 [MIRROR] Addiction rework (#3445)
* Addiction rework

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:26:44 +00:00
SkyratBot
7da4aa9adf [MIRROR] Reaction rates, pH, purity and more! Brings a heavily improved, less explosive and optimised fermichem to tg. (#3306)
* Reaction rates, pH, purity and more! Brings a heavily improved, less explosive and optimised fermichem to tg.

* a

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-12 00:04:39 +00:00
SkyratBot
47f8fbba05 [MIRROR] Move Jolly and Depression into mood handling (#3286)
* Move Jolly and Depression into mood handling (#56580)

The Jolly and Depression quirks are much more active. You can expect the positive/negative moodlets to affect you around 50% of the time.

Previously, the probability of the Jolly/Depression moodlet firing was so low, you only have a less than 1/3 chance of seeing the 2 minute moodlet in an hour of play. Now they will be far more active.
Depression's hardcore point value has increased, since it is far more negative now.

The quirks now just add the TRAIT_JOLLY and TRAIT_DEPRESSION, which is then used by the mood component to have a chance of triggering the corresponding mood episode.

Gonbolas now have an always on positive mood message, rather than applying a do nothing TRAIT_JOLLY trait.

To demonstrate how the mood traits are independent of the quirks, There is now a "jolly grey cap", which gives you TRAIT_JOLLY while it is being worn.

* Move Jolly and Depression into mood handling

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-11 13:11:46 +01:00
SkyratBot
e0a4b94b6d [MIRROR] felinids with the family heirloom quirk can now roll toy mice as their family heirlooms (#3277)
* felinids with the family heirloom quirk can now roll toy mice as their family heirlooms (#56790)

* felinids with the family heirloom quirk can now roll toy mice as their family heirlooms

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-02-11 00:05:57 +00:00
SkyratBot
731a995bcf [MIRROR] Improves Kissing (#3167)
* Improves Kissing (#56698)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Improves Kissing

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-07 09:41:24 +00:00
Gandalf
db677186eb Lopland Security and Armadyne Weaponry rework [Security Medic and Sergeant] [RFT] (#2860)
* REMOVE BATONG

* Stage 2 emitters

* aaa

* aaaa

* Climb up and start the rotors

* the DOORS MASON

* Stage 3 emitters

* a

* a

* Update belt.dm

* aaaa

* more clothes

* update, wintercoat!

* Update wardrobes.dm

* Update wardrobes.dm

* test

* Better

* STAGE-4 BOIS

* No wait, it's stage 5

* aaa

* gunsets and tokens!

* hot backend stuff

* Fixes

* aaa

* QUICKDRAW!

* The smartgun

* a

* a

* a

* Map changes

* a

* Merge branch 'master' into thesecining

* Merge branch 'master' into thesecining

* PHASE 6 LADS, IT'S DONE!

* Merge branch 'master' into thesecining

* smartgun delay

* New HUD and ID cards + EMP protection system

* Create readme.md

* flashlight

* clof

* Update master.dm

* 6.5

* armadyne

* SECURITY SERGEANT AND MANY TWEAKS

* Update security.dm

* a

* Update jobs.txt

* Update security_sergeant.dm

* Report to!

* Update guns.dm

* Merge branch 'master' into thesecining

* redesign

* Update MetaStation_skyrat.dmm

* Update KiloStation_skyrat.dmm

* Update decals.dm

* It's nearly done lads.

* corpo

* a

* Update ammo.dm

* a

* Update bullets.dm

* fuxes

* Update shields.dm

* a

* Update guns.dm

* Bullet drive + fixes

* Update gunsets.dm

* Update bulletdrive.dmi

* Update hud.dmi

* fix

* fs

* a

* .

* Update bullets.dm

* aaa

* Update bullets.dm

* Update tgstation.dme

* bulletbot

* Update bulletbot.dm

* a

* oops

* fixes

* aaaa

* Update vending.dmi

* a

* seclock

* aaa

* a

* a

* a

* Update ammoboxes.dmi

* fixesa

* a

* Update guns.dm

* a

* Update guns.dm

* Peacekeeper hardsuit

* a

* a

* aaa

* Update peacekeeper_clothing.dm

* couple fixes

* Merge branch 'master' into thesecining

* hitscan laser gun

* a

* Merge branch 'master' into thesecining

* a

* a
2021-02-04 16:38:48 +00:00
SkyratBot
73023cbd6b [MIRROR] Adds Extrovert and Introvert Quirks (#2964)
* Adds Extrovert and Introvert Quirks (#56490)

Adds Extrovert and Introvert quirks. Removes the free bar moodlet, gives it to extroverts, makes a corresponding library moodlet for introverts. Introvert and Extrovert are blacklisted and therefore mutually exclusive.

Seems a bit thin, could we do x?
Yeah sure, and I'd appreciate feedback on where you'd like to see these quirks go. I want to start basic with "where do they spend their free time?" Rather than trying to do something big like moodlets for speaking a lot/little, especially because that seems a bit unbalanced and we already have a quirk that penalizes speech. I'm also looking to avoid unrealistic stereotypes, speech penalties to introverts are kind of unreasonable, introverts aren't inherently bad at talking, they just like alone time.

Why make it free?
I'm taking away a pre-existing moodlet that was free for everyone, also positive quirks are capped at 6 and I see this quirk as being essential to character building so I would prefer not to make someone pick between giving any sort of depth to their character and their powergaming loadout.

Having players define their character as introverted or extroverted and reinforcing the decision through gameplay mechanics is a great way to get them thinking about their character beyond an avatar to make other spacemen horizontal with. I'd argue that it is as foundational as decisions like gender, species, and age.
This opens up the library as a social space, as the two people who take introvert might occasionally run into each other when they are recovering mood and sanity there.

* Adds Extrovert and Introvert Quirks

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-31 15:55:18 +00:00
SkyratBot
4673d2e753 [MIRROR] Visual Indicator for Bad Touch Quirk (#2940)
* Visual Indicator for Bad Touch Quirk

* Update carbon_defense.dm

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-29 16:53:25 +00:00
SkyratBot
56d1ff6325 [MIRROR] Poor Aim causes blind.eyes(1) per shot (#2936)
* Adds gun-shyness (#56463)

* Poor Aim causes blind.eyes(1) per shot

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-29 14:12:23 +00:00
SkyratBot
a2a2a68c27 [MIRROR] Adds trait-dependent room moodlet check (#2926)
* Adds trait-dependent room moodlet check (#56462)

Moods caused by areas can now be gated by requiring a specific trait
to trigger it.

Added a positive moodlet for the Chapel, but only for people with
the TRAIT_SPIRITUAL trait.

* Adds trait-dependent room moodlet check

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-28 18:12:44 +00:00
SkyratBot
893a941276 [MIRROR] Renames quirks containing folder to quirks/ (#2903)
* Renames quirks containing folder to quirks/ (#56428)

Despite what the folder name may suggest, `code/datums/traits` does not
actually deal with traits, but instead roundstart quirks. This rename
makes this explicitly more obvious, and easier to understand, rather
than remaining as a historical artifact.

* Renames quirks containing folder to quirks/

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-01-27 11:18:03 +00:00