Commit Graph

88 Commits

Author SHA1 Message Date
actioninja
b87884f4a3 Revert "refactors + fixes"
This reverts commit 5ed2e36d80.
2019-07-22 23:30:23 -07:00
actioninja
5ed2e36d80 refactors + fixes 2019-07-22 23:29:17 -07:00
Mickyan
1b8ed8b6b8 weak (#44894) 2019-07-10 19:58:59 +02:00
Garen Crownguard
534a9140aa merge 2019-07-05 17:59:38 -05:00
XDTM
d70c43c5f1 Checks for metabolization on some has_reagent (#44653)
About The Pull Request

Stuff that should logically require you to actually be metabolizing the reagent now requires a liver, or the reagent to not need one.
Some reagents have been granted self consuming status, like holy water, since their effects are not tied to the metabolism.

Fixes #44650
Fixes #43024 since there should be no real way to mitigate the constant toxin damage now
Why It's Good For The Game

Less exploits with livers, more consistency in mechanics.
Changelog

cl XDTM
fix: Viral healing symptoms that are tied to reagents now also require a functioning liver to work.
tweak: Holy water, Pyrosium, Cryostilane, Napalm and Phlogiston no longer need a liver to have their effects.
/cl
2019-06-29 21:08:38 +12:00
Garen Crownguard
3a37d0322c merge 2019-06-23 20:39:24 -05:00
AnturK
ec97bbceee Fixes musician quirk runtime without backpack. (#44703)
* Fixes musician quirk runtime without backpack.

* copypasta mistakes.
2019-06-22 01:43:01 -04:00
nemvar
c44120b5d1 Adds bee plushies (#44342)
* Adds beeplushies

* makes the behind less pure black

* Newline
2019-06-07 13:55:02 -04:00
Nalzul
47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
Emmett Gaines
c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
Garen Crownguard
caa683e5b1 merge 2019-06-04 07:04:21 -05:00
Garen Crownguard
4b2fc4cc05 Removes Hygiene 2019-06-04 06:25:51 -05:00
kingofkosmos
1bf60bbe06 Adds missing </span>'s. 2019-06-02 21:29:14 +03:00
vuonojenmustaturska
6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
oranges
1f204cf008 Merge pull request #44172 from wesoda25/bruhmoment
Removes Physically Obstructive Quirk
2019-05-30 21:05:16 +12:00
wesoda25
6a71ec923a Update negative.dm 2019-05-27 23:38:03 -04:00
RaveRadbury
7c9576c6e2 Puts medical record quirks in Medical Record "Important Notes", gives each quirk a medical record, cleans up subjects into patients. (#44009)
* Gives each quirk a medical record, cleans up subjects into patients.

* Update code/datums/traits/good.dm

adds a period I missed

Co-Authored-By: loser <loser@nonagon.host>

* Dumps medical quirk string into medical "Notes"

* Implements bgobandit's suggestions

* ~Comma, comma, comma, comma, comma, commits from Cobby~

Also I missed an A.

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-05-24 12:45:33 -04:00
RaveRadbury
9ab2ad72ca Reworks "Religiously Comforted" mood_event (#43995)
* Initial poking around

* adds a message to let you know the examine proc'ed

* converts time to minutes

* removes old on_process() code

* Nests procs under if(!appears_dead)

* nests blocks under src != user
2019-05-21 18:53:13 -04:00
Mickyan
3b5c9b5a34 [READY] Moves mood quirk checks to their respective quirk process (#43845)
* quirk process

* does the same for hygiene

* un-breaks miasma generation

* so how's your day going
2019-05-12 10:52:25 +12:00
vuonojenmustaturska
fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
Mickyan
268316731f [READY] Adds the Empath and Friendly quirks (#43651)
* things

* newliiine

* better text
2019-04-23 15:00:14 -04:00
Tad Hardesty
09949fe611 Fix welfare being given to everybody else with the same job (#43490)
* goddamn NEETs ruining my economy, fixes #42387

* Fix remaining broken call to add_neetbux
2019-04-08 10:29:51 +02:00
Mickyan
772be289ce Tweak blood deficiency to be less deadly by itself (#43501)
I came to the conclusion that quirks that put you on a death timer are
dumb and boring, one such reason being they make you unable to go AFK for
any length of time but also aren't interesting to manage other than
lugging around whatever medicine you need to survive every round.

Blood loss now stops just above a survivable threshold, meaning when left
untreated even the smallest of wounds is potentially lethal, hence it's
still 2 points. Watch out for paper cuts.

Renamed just to make it a bit shorter and less spooky.
2019-04-06 12:35:27 -07:00
anconfuzedrock
303d45287a does whatever mood_quirk = true does 2019-03-20 23:35:14 -04:00
anconfuzedrock
8465e881a2 adds backpain quirk 2019-03-20 18:04:32 -04:00
tralezab
7762e72405 New trait: Unstable (#42904)
* nice.

*  They exist to cease.

*  "They've got eyes inside my head!"

* frick

* unstable insanity

* Just try taking this bull by the horns. (eyeballs)

* It's a thankless job, and you'll probably die in an explosion. But the pay is pretty good.

* "The best denials are simply that: a beginning and end unchanged, a dream with no memory."

* fixes the dme
2019-02-28 10:35:13 -05:00
Time-Green
3be9f4c165 removes double paraplegic (#42858) 2019-02-21 10:53:10 -05:00
ShizCalev
e8630127f5 Fix junkie quirk (#42844)
Junkies will now spawn with their pills correctly filled with their appropriate
drug.
2019-02-19 22:11:33 -08:00
ShizCalev
c1e77440b8 Fix neet quirk runtime (#42825) 2019-02-18 19:56:20 -08:00
imsxz
d5abf90113 pacifist antags retain pacifism (#42674)
* pacifism forever

* oops

* plan z can't possibly fail
2019-02-12 19:55:24 -05:00
coiax
2ed34af9c0 Adds Paraplegic quirk (#42503)
🆑
add: Adds the Paraplegic quirk for -3 points. You start with unhealable leg paralysis
(persists through cloning), and have a wheelchair to move around the station.
/🆑

This is really popular for some reason.

This required a surprising amount of small code tweaks for it to "feel"
right in edge cases like being a job that had items in their hands or
joining on the arrivals shuttle.

Justification for -3 points: You move REALLY slowly, in a game that's
about generally running from security/the guy with the esword. And if
you die and get cloned and don't have your chair, you move even slower.
2019-01-30 12:08:54 -05:00
Rob Bailey
08afd120f4 [Ready] Smoker and Junkie Quirks (#42477)
* drug quirks

* more work on junkie trait

* more druggie work

* work pls

* make the junkie trait actually fucking work and not runtime

* fix the smoker quirk

* fix capitlization on the reagent containers

* refactored

* less shitcode

* fix errors

* add meth and crank since it's 0.5u

* fix dupe chem + fix addictions list being loaded with null

* relapse mechanic

* have addiction applied on spawn again

* remember to compile kids

* some logic error corrections

* fix another logic error resulting in relapses never triggering

* fix the logic error that I thought I fixed to begin with but accidentally made worse

* I really have the fucking dumb right now.

* reset the addiction when it's readded

* better syntax for list addition

Co-Authored-By: actioninja <actioninja@gmail.com>

* suggested changes

* better new syntax

Co-Authored-By: actioninja <actioninja@gmail.com>

* turf var

* correct syntax error

* renamed vars

* announce proc instead of hacky logic

* clearer logic refactor

* increment operator

Co-Authored-By: actioninja <actioninja@gmail.com>

* make it actually compile

* no null patrol

* fix accessory spawning

* fix runtime from the reagent list being full of instances apparently

* buff pill contents so they actually satisfy addiction

* adds cigars to the smoker spawn pool

* I think this is what cyber means?
2019-01-29 10:11:13 -05:00
Jack Edge
5632b78831 Improves Spiritual quirk
🆑 coiax
add: Players with the Spiritual quirk now spawn with a pack of candles
and a box of matches, for better communion with their chosen power, and
get a mood boost while near a holy person (generally the chaplain).
/🆑

Makes Spiritual not just a quirk that literally requires admin
approval to pay off. Have some free candles, talk to the chaplain to
cheer up, and maybe you'll be able to gang together to convince the gods
to give you an angry bloodcrawling duck.
2019-01-10 23:06:15 +00:00
Nich
152cf42c59 turns the 2 hygiene quirks into mood quirks 2019-01-04 21:40:01 +01:00
Qustinnus
0de28b726a [READY]Humans now have hygiene (DOES NOT AFFECT MOOD GO AWAY MOODPOSTERS) (#41986)
cl Floyd / Qustinnus
tweak: You now have to be naked to get the nice shower moodlet, if you shower with clothes you get a bad moodie
add: Hygiene, you slowly become dirty over time, the more covered in blood you are the faster you will lose hygiene. When you are too dirty you will have a stink overlay. (Hygiene doesn't affect mood currently) It also spawns miasma slowly if you smell like shit.
add: adds NEET and neat traits. NEET's get 20 bucks social welfare extra and like being unhygienic, while neat people dislike being unhygienic and like being hygienic
/cl

This doesn't affect mood so plssss dont strawman in this PR about how I'm forcing you to shower or die or whatever

This PR is mostly visual and will allow for people to judge others for literaly being smelly as hell.

also NEET and neat traits which interact with being smelly. (neat likes hygiene, dislikes lack of it. NEETs like lack of hygiene and get some social welfare (20 bucks))
2019-01-02 01:04:51 +13:00
Mickyan
e6de5b36eb Adds the Hypersensitive and Light Drinker quirks (#41984)
* newquirks

* revert

* hypersensitive/light drinker

* this is a commit

* may as well

* increments + fix

* i never liked math anyway

* I really dont like math
2018-12-18 15:03:57 -05:00
XDTM
fe4c77b4cb Vegetarian Quirk (#41800)
cl XDTM
add: Added the Vegetarian quirk, which costs 0 points and makes you dislike meat.
/cl

Because why not? Also, it could give a reason for the chef to prepare vegetarian dishes instead of the usual stuff.
2018-12-09 23:19:59 +13:00
coiax
84b64328b9 Improves code implementation of the Musician trait (#41742)
cl coiax
add: Any talented Musician can now use any instrument to lift
spirits, and ease burdens. They can now also use the space piano and minimog
to grant people the Good Music buffs, just like a handheld instrument.
/cl

A living mob with TRAIT_MUSICIAN will now apply the Good Music
status effect to everyone who can hear the music. The buff will
now apply even to players who have disabled instrument sounds.

The Good Music status effect lasts for 6 seconds after the
musician stops playing.

Added STATUS_EFFECT_REFRESH that just refreshes the duration
of a status effect, rather than instancing a new one.
2018-12-09 23:08:03 +13:00
coiax
40344ab093 Heirlooms have additional examine text, rather than being renamed (#41676)
cl coiax
add: Heirlooms are no longer named "Cherry family bag of dice", but
rather their heirloom status can be determined by the owner on examine.
/cl

Because names are inherent to an object when anyone looks at it, I feel
it can be somewhat confusing that you can tell that this screwdriver
is a precious family heirloom just because of its name, rather than
because of the significance that someone holds it.

Only the owner of the heirloom receives the special examine text; so I'm sure this could probably be used to bluff ownership of something non-standard, if and when heirlooms become more exotic.

Heirlooms still work in the same way though, mood bonus from holding, mood penalty if you don't have it.
2018-12-09 23:03:34 +13:00
Jack Edge
579ce52279 Sorted alphabetically 2018-12-03 02:43:12 +00:00
Jack Edge
d641feba16 Adds Physically Obstructive quirk
🆑 coiax
add: Adds the Physically Obstructive negative quirk. A person with this
quirk can't swap places with other people when moving, akin to someone
always being in non-help intent.
/🆑

Adds the TRAIT_NOMOBSWAP to accomplish this.
2018-12-01 16:02:22 +00:00
coiax
446641f329 Repath blindfolds to prevent regular sunglasses creation exploit (#41710)
Blindfolds don't actually need to inherit anything from sunglasses, from what I
can see, unless there's some bad type checking somewhere in the code that I'm
not aware of.

Exploit is: cloth makes blindfold + medHUD -> medHUD sunglasses -> remove
medHUD, regular sunglasses.
2018-11-30 14:21:22 -08:00
Mickyan
6b30b578bb Makes the quirk menu look less cluttered (#41684)
* quirk menu format

* brain damage
2018-11-28 22:43:03 -05:00
Mickyan
f74da96676 Voracious quirk lets you binge on junk food, gives positive mood while fat (#41541)
* voracious tweaks

* description
2018-11-19 14:38:12 -05:00
Emmett Gaines
a6971e2673 You can put spaghetti in your pocket (#41517)
* You can put spaghetti in your pocket

* Improved drop text
2018-11-16 13:25:59 +01:00
81Denton
73f9b629a8 Adds deafness quirk (#41397) 2018-11-13 01:39:19 -05:00
moo
c07f2a65da Streamlines beacon types (#41192)
* Streamlines beacons

* Adds a comment on how to use this.

* When the item spawns in the angels now sing

* haha it's a webedit guys!

* Let Centcomm know!

Co-Authored-By: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* musicly fans rejoice

Co-Authored-By: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2018-11-01 07:52:43 -04:00
Militaires
0a0b58b5bb fixes 2 minor blindness quirk bugs (thank u cyberboss) (#41198)
* fixes 2 minor blindness quirk bugs (fuck u cyberboss)

* commit 2 fix

* doneeroni

Here u go

* let's do it

Co-Authored-By: Militaires <ahmedosama2001@gmail.com>
2018-10-29 09:01:03 -04:00
Mickyan
2fed211e6d i can't even get one line of text right 2018-10-27 21:28:33 +02:00
Mickyan
3efb328687 heavy sleeper text 2018-10-27 21:26:18 +02:00