Commit Graph

33 Commits

Author SHA1 Message Date
Nich
584bb21141 Merge branch 'master' into slingshots 2018-09-01 09:59:15 +02:00
Mickyan
de927db5aa Artsy fartsy quirks (#39930)
add: Show your support for the fine arts with these new quirks:
add: Tagger: drawing graffiti takes half as many charges off your spraycan/crayon
add: Photographer: halves the cooldown after taking a picture
add: Musician: tune instruments to temporarily give your music beneficial effects such as clearing minor debuffs and improving mood.

These should be pretty straight forward, musician is especially interesting because you can share tuned instruments with other players, and think it has the potential for some interesting cooperation. For example, as a musician bartender you may decide to hand your tuned instrument to the mime so they can play music and have your customers not stumble around as much while also making them happier!

I don't think there's realistically any balance concerns. Most of the debuffs it clears can already be cleared by drinking tea, they're a pretty rare occurrence in a fight and are usually gone before you have the chance or need to do anything about them. At most helps you walk straight while you're drunk, really.

All these quirks make you start the shift with all the tools of the trade, to make them more worthwhile to take and make the player feel like their quirks are part of their character on a regular basis (ex. a player with the tagger quirk is more likely to make graffiti on a whim, a photographer will always have a camera to take pictures of interesting things etc. whereas they would otherwise have to round up supplies at roundstart every time)
2018-08-30 13:09:41 +01:00
Joe Schmoe
19512961c0 fixes and tweaks 2018-08-29 20:21:34 +02:00
Joe Schmoe
927c941a7b fixes and tweaks 2018-08-27 21:11:48 +02:00
Jordan Brown
fbc88735ba Merge pull request #39410 from Mickyan/social_anxiety_tweaks
Makes social anxiety less miserable
2018-07-29 00:52:23 +01:00
Mickyan
f7e1c01cc0 Light Step quirk stops you from leaving footprints (#39339)
* light step doesn't leave footprints

* description
2018-07-26 19:37:46 +02:00
Jordan Brown
4f4e129bc2 Merge pull request #38937 from AnturK/morequirkshit
Fixes quirk removal runtimes.
2018-07-07 05:05:19 +01:00
Tad Hardesty
10e0fa2560 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-15 12:40:41 +01:00
Jordan Brown
0a1bf10d0d Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone
Fix family heirloom being lost on cloning
2018-06-01 15:50:06 +01:00
Nich
a8534f6141 Merge pull request #1044 from yogstation13/upstream-merge-38105
[MIRROR] Fix: Negative blood levels now kill you
2018-05-29 13:42:55 +02:00
CitrusGender
9d7f8de434 Fix: Negative blood levels now kill you (#38105) 2018-05-28 07:34:33 +01:00
Mickyan
ea333b475c New Trait: Drunken Resilience (#38076)
* drunk healing

* balance, bugfix

* more consistent wording

* removed random chance and tweaked values

* rounding values

* 0 to FALSE, slightly lowered top values
2018-05-27 22:23:33 +01:00
Jordan Brown
5909f997d3 Merge pull request #37939 from AutomaticFrenzy/patch/heirlooms
Fix some issues with family heirloom spawning
2018-05-21 11:38:33 +01:00
Iamgoofball
ae92a84c38 family heirlooms properly open the bag upon spawning if they're in the bag (#37754) 2018-05-11 21:28:30 +01:00
XDTM
a64f7deac3 [s] Hallucinations 4.0 (#37423)
No ingame changelog cause these are supposed to fool people.

Changes:

    Hallucinations now pick from a single weighted list, instead of being separated in tiers. The more obvious a hallucinations, the less likely it is to appear.
    Hallucination is now a contantly ticking down variable. 1 hallucination = 2 seconds duration. Hallucinating effects have been rebalanced to fit this.
    Hallucinations have a random cooldown ranging from 10 to 60 seconds. The status will still tick down in the meantime.
    The Sounds hallucinations has been split in three: realistic sounds (likely), weird sounds (rare), and station messages (i.e. the shuttle arrived, blob warning, etc.)(also rare).
    The Bolts hallucination now stops you from bumping doors open. You can still click them to open them.
    Removed the singulo hallucination. It's pretty much impossible to make it realistic enough, and it's too widely known to scare someone. It's an annoyance and a definite tell that you're hallucinating.
    Removed the xeno attack for the same reasons. It was kept in the code to serve as a pseudotemplate for hallucination mobs.
    Removed the fake attacker hallucination. Trying to replicate full attack and defense code as well as managing icon generation with blacklists and all is just not worth it. It would never be realistic enough.
    RDS hallucinations have been either rolled into normal ones or removed (the OOC ones). No reason to keep them separate, aside from throwing off the hallucination odds (which has resulted in complaints about the cult victory warning being too common).
    Added/edited a lot of strings for the text-based hallucinations. I could definitely use a few more for the message hallucination, i got writer's block there.
2018-05-09 22:15:56 +01:00
oranges
e19a4edb10 Merge pull request #37646 from Xhuis/conflicts_imminent
Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-06 13:21:20 +01:00
Armhulen
22f59c5067 deadly brain tumor now gives -3 points (#37455)
* i can tweak it if need be yadda yadda one line change

* ok lets be SENSIBLE.
2018-05-03 03:24:12 +01:00
Jordan Brown
b836829b1c Merge pull request #37513 from ShizCalev/pineapple-memes
Adds traits for a character's preference towards pineapples.
2018-04-30 19:04:23 +01:00
oranges
feca7a7b38 Uppercases slot defines. 2018-04-28 09:49:08 +01:00
Jordan Brown
9d2ae43466 Merge pull request #37431 from Mickyan/anemic
New Trait: Acute Blood Deficiency
2018-04-26 21:21:07 +01:00
kevinz000
9ba8e6df20 Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 12:46:50 +01:00
Ashe Higgs
8c66b9fc70 Disables mood traits when mood is disabled (#37082)
* disables mood traits if mood is off

* my copypasta is showing

* Update negative.dm
2018-04-11 15:44:28 +01:00
vuonojenmustaturska
787a92dc59 Fixes an heirloom trait-related runtime that gets spammed in the logs (#37036)
* honk

* return

* Update negative.dm

* Update _trait.dm
2018-04-09 15:20:15 +02:00
Jordie
93151e2001 Merge pull request #36945 from KorPhaeron/aprilfools
Removes april fools from heirlooms
2018-04-03 12:11:38 +01:00
Ashe Higgs
07f03fa975 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 14:15:08 +01:00
Ashe Higgs
3ef72bfdbe Fixes slimeperson traits (#36663) 2018-03-27 03:12:27 +01:00
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
kevinz000
2cd09cc381 .len runtime fix (#36275) 2018-03-10 02:04:06 -06:00
Qustinnus
5140cff38c [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] (#35475)
Floyd / Qustinnus (Sprites by Ausops, Some moodlets by Ike709)

add: Adds mood, which can be found by clicking on the face icon on your screen.
add: Adds various moodlets which affect your mood. Try eating your favourite food, playing an arcade game, reading a book, or petting a doggo to increase your moo. Also be sure to take care of your hunger on a regular basis, like always.
add: Adds config option to disable/enable mood.
add: Indoor area's now have a beauty var defined by the amount of cleanables in them, (We can later expand this to something like rimworld, where structures could make rooms more beautiful). These also affect mood. (Janitor now has gameplay purpose besides slipping and removing useless decals)
remove: Removes hunger slowdown, replacing it with slowdown by being depressed
imageadd: Icons for mood states and depression states


What this PR is

This PR adds a system that allows player to gain and lose moodlets based on events occuring to, and around them. These events then give the player a mood value based on what it is. For example a hug could give you +1 mood, while being stabbed in the eye with a screwdriver can give -5 mood. All these moodlets together determine the mood of your character which currently affects the following things:

    Movement speed - If you are very sad you move slower. Replacing movement slow from hunger. (hunger now instead affects mood)
    Screen blur - If you are sad you gain an overlay that slightly blurs the screen, increasing in severity as you get sadder.
    Interaction / do after speed - If you are sad or happy your interaction speed with things such as handcuffs is changed. with a 25% longer time if you are sad, or 10% shorter time if you are extremely happy.
    Hunger rate - You gain hunger slower if you are very happy.
2018-03-08 14:15:57 +13:00
vuonojenmustaturska
034b0c8343 Merge pull request #36202 from cebutris/lithenessk
Small spellcheck in traits
2018-03-08 00:02:58 +02:00
Ashe Higgs
5c8d845f56 [s] Improves and secures trait assignment code, allows their pref to be changed midround, tweaks RDS and Night Vision (#36160)
* Traits but less buggy

* no tick while dead

* fix security vuln
2018-03-06 15:57:42 +02:00
Cebutris
78d4e57ba7 lithnessk -> litheness 2018-03-06 08:04:22 -05:00
Ashe Higgs
ab9e2e8902 Adds minor roundstart traits! (ala CDDA, etc.) (#35440)
* Roundstart traits

* Unspaghettifies night vision

* Fuck everything

* Issues patch
2018-03-02 13:39:44 +13:00