Commit Graph

16 Commits

Author SHA1 Message Date
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