Commit Graph

3838 Commits

Author SHA1 Message Date
Alomga
4be0871250 Tweaks stats of 4 virus symptoms (#36748)
Makes Vitiligo, Revitiligo, Facial Hypertrichosis and Alopecia usefull instead of making your virus worse without contributing anything. Symptom that makes you pale shouldn't have worse stats that one that can kill.
2018-03-29 13:21:35 +13:00
Tacolizard
2d985dc390 Fixes phobia word recognition (#36457)
* fix

* Update phobia.json

* add plural detection
2018-03-28 21:43:07 +03:00
Ashe Higgs
bd42041c9c 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 16:14:08 +03:00
BeeSting12
f2f11c9d33 >happend 2018-03-27 14:29:21 -05:00
Armhulen
5ed2a56ced Refactors Spell and Martial Art Books to use Action Granters! (#36442)
* HE'S DONE IT

LETS GOOOOOOOOOOOOOOOH

* floyd. floyd. he's the floyd. floyd dude yeah yeah yeah yeah FLOYD

* fireball remarks, the other spells.

* YOU MEAN THE CHAOS FLOYDS

* what is a floyd, but a miserable pile of moodlets

* flflflflfoooaooayoyydd FLOYOYODDD DFFRRURURMPPFF

* FLOYDING LIGHTS LIGHTS LIGHTS LIGHTSSS

* GORGE YOUR MOODLETS, EMBRACE YOUR FLOYD

* no more floydposting, i removed the old spellbooks

* aaaaaaaaaaaaaaaaaaah ALL of the remarks added my fucking god

* 10 days to sunday travis.

* last minute fixes

* 1 fix

* 2 fix

* red fix

* martial granters

* MAMA MIA
2018-03-27 20:51:14 +03:00
vuonojenmustaturska
bc8958cc14 Merge pull request #36541 from XDTM/NOTTHEBEES
Swarming component! Beware of bees
2018-03-27 17:04:09 +03:00
Ashe Higgs
b6b1230231 Fixes slimeperson traits (#36663) 2018-03-26 22:11:33 -04:00
arsserpentarium
92fe820f3d [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 19:01:34 +03:00
kevinz000
e2a7094776 Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 18:48:50 +03:00
AnturK
735dad092e Sintouched antag datums (#36561)
* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs
2018-03-25 06:07:26 +03:00
Armhulen
9dc51ecf7b Fixes Mush Punch (#36631)
* sometimes you just gotta own up to your mistakes :(

* I'm gonna be the best friend you have to ask for yourself to be the most things I can tell 

Real shit
2018-03-24 06:34:31 -04:00
YPOQ
b95374ea4c Fixes imaginary friend trauma (#36647) 2018-03-24 05:03:13 -04:00
kevinz000
4a23703622 Combat Overhaul Staging: Limb Specific Stamina and status effect clickdelay modifiers! (#36274) 2018-03-23 12:36:35 +01:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Qustinnus
f79de1ec9b Adjusts the behavior of Mood on sanity (#36640)
cl Floyd / Qustinnus
balance: Changes rate of sanity drain and caps it depending on mood
/cl
Kor gave me permission to work on mood during the freeze so I could stop the fuckload of people that ping me 5 times with insults.

If you are only slightly sad, you wont go insane, but go to a cap, to go insane you /need/ to be in a bad mood at the same time, or you will go back to sane really fast. Also sanity drain rates lowered.

Also if there's bugs/issues with mood just make an issue on the issue trackers, I dont need you pinging me at 4AM to tell me how I'm horrid at things. It'll just make me get a headache. I'm making PRs in good faith, not to annoy the playerbase. The same respect in return would be appreciated.

If mood doesn't work out after this the Headmins will turn off the config, and I'll look into either rebalancing it or repurposing it.
2018-03-23 18:51:09 +13:00
kevinz000
ca10fa6d7a Spell Cards (#36147)
Adds spell cards. They're a wizard spell that shoots a burst of 5 semi-accurate homing cards.
Projectiles now have a homing framework, complete with some variant of simulated inaccuracy.
The said wizard spell will make use of a new mob component, that allows that mob to select targets by moving their cursor near them. It will give a visual and lock onto the nearest mob to the cursor, allowing the homing projectiles to target on the locked on mob/object.
Removes colliding variable from projectiles - We never used it after Bump was refactored to Collide.
Images soon when I get the lockon datum-components to work.
2018-03-23 09:39:26 +13:00
kevinz000
d7ffa2ab57 Fixes asclepius rod runtime (#36595)
* Fixes asclepius rod runtime

* isanimal
2018-03-22 12:18:29 -04:00
Qustinnus
af2afa1cc0 Being happy no longer makes you obese. (#36565)
* D O U B L E N E G A T I V E

* jesus
2018-03-21 16:34:46 -04:00
XDTM
220f0588ad Fixes some more trauma bugs (#36487)
* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm
2018-03-20 21:31:08 -04:00
Jordie
9de5d92b8c colour fix 2018-03-19 19:53:18 -05:00
Jordie
9c1731e75b Distinguishes law types by colour (#36463)
* distinguishes law types by colour

* hacked laws now separate from ionic

* fix and less src.

* moves hacked laws above ion

* also the ai fixer

* also missed order in stating laws

* Less garish blue
2018-03-19 20:31:51 -04:00
vuonojenmustaturska
287ee756e8 Adds two new intermediate beaker types to chemistry (#36484)
* a commit

* rebase

* 180
2018-03-19 20:22:32 -04:00
vuonojenmustaturska
7e86194058 Updates rhumba beat to be more different from GBS (#36439)
* Update rhumba_beat.dm

* clarifying comment
2018-03-19 20:14:43 -04:00
Armhulen
3ebab638c1 Brain Damage Trait (#36235)
* OK FINE GOD.

* balance??
2018-03-19 20:01:15 -04:00
kevinz000
43fab2f157 Fixes stacks and material containers, fixes wet floors (#36497) 2018-03-19 19:43:48 -04:00
XDTM
415e977509 Swarming component! Beware of bees 2018-03-19 23:36:38 +01:00
Ian Turk
fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
Qustinnus
4911991f70 [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
2018-03-18 19:48:50 +13:00
TheDreamweaver
6cfd7ad9ad Fixes dupe and runtime issues with Rod of Asclepius (#36410)
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
2018-03-17 15:21:48 +02:00
Cruix
7639492389 Added clown ops game mode, and several clown weapons. (#36459) 2018-03-17 02:40:53 -04:00
kevinz000
fe5fdec776 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 11:26:09 +13:00
oranges
c7d42c49b9 Merge pull request #36432 from ShizCalev/braindamageeventruntime
Fixes brain damage json runtime
2018-03-17 11:18:41 +13:00
vuonojenmustaturska
a337065169 Merge pull request #36397 from AnturK/xeno_antag
Simple xeno antagonist
2018-03-16 13:40:57 +02:00
XDTM
e34930714b Refactors some trauma code, fixes some trauma heals not working (#36093)
* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments
2018-03-15 07:57:46 +01:00
ShizCalev
2211eb0bc1 Fixes brain damage json runtime 2018-03-15 00:05:17 -04:00
AnturK
f0997f4ac1 Simple xeno antagonist 2018-03-13 20:32:06 +01:00
vuonojenmustaturska
711fa0caff Merge pull request #36349 from imsxz/cancer
removes viral aggressive metabolism
2018-03-13 14:10:11 +02:00
TheDreamweaver
68cafe6fd1 Adds Wheely-Heels and Kindle Kicks [Merge Ready] (#36309)
* Adds Wheely-Heels, a pair of shoes with inbuilt roller-wheels. Can be rarely received as reward from arcade machines.

* Fixed issues with Wheely-heels, added Kindle Kicks

* Cleaned up code

* Fixed Destroy()

* Thoust shall return the parent, like Oedipus

* Final Fix XIV
2018-03-13 02:57:48 -06:00
vuonojenmustaturska
6aabcac079 Create ERT refactor (#36321)
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
2018-03-12 23:48:09 +13:00
imsxz
31dab5b7dd removes cancerous tumor 2018-03-11 23:22:23 -04:00
TheDreamweaver
f4e0f567ef Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)
* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage
2018-03-10 02:52:03 -06:00
Singularbyte
b7dd356d55 Fixes bodies responding to phobias (#36227)
* Fixes ghosts responding to phobias
When a ghost inhabiting their body hears a phobia word, they no longer
freak out.

* Modified to a guard clause
2018-03-10 02:28:33 -06:00
kevinz000
2cd09cc381 .len runtime fix (#36275) 2018-03-10 02:04:06 -06:00
oranges
55f5870b7b Merge pull request #36233 from AnturK/nulllove
Adds explicit check for numberless backpack contents in outfits.
2018-03-09 18:21:35 +13:00
ACCount
1f5b59190d NTNet airlocks (#35947)
* Standardizes access checks

* Makes SS Networks init before SS Atoms to prevent NTNet interfaces from initializing before them

* Adds passkey support to NTNet packets

* Adds NTNet support to airlocks, makes door remote use NTNet

* Access levels given by jobs are now shuffled

* Access code improvements

* Adds IC card readers

* Fixes a delay issue with opening/closing airlocks with NTNet or signalers

* code review memes

* Renames plaintext_passkey to encrypted_passkey

* death by thousand nitpicks
2018-03-08 18:39:17 -05:00
Slignerd
4a85877617 Gives ash drakes a togglable small sprite (#35993)
* Adds togglable small sprite

* Fixes duplicate definitions

* Splits action datums (temporary fix)

* Adds smallsprite.Grant(src) to ash drake's Initialize()

* Makes small sprite toggle its own thing

* Subtypes

* Moves the small sprite over to mob.dmi

* Cleanup

* Lesser ash drake clickbox is now only as big as the sprite

* Introduces the ash whelp sprite

* Splits name and desc

* Welp
2018-03-08 01:39:52 -05:00
Qustinnus
0bc8550e1c Small moodie balance changes (#36242)
* quickfixes

* mooddefines

* im dumb

* zzz i sleep
2018-03-08 17:39:33 +13:00
Armhulen
84d4b3aae6 Mushroom people, revived! (#35858)
* caps fixed, small other fixes and mushpunch

* honey, i fixed the bugs!

* STUPID YORII DUMB GIRL STINK LEAVE

* boolean is such a fun word

* zoinks

* F_XED

* fixes part 2

* TRUEs and FALSEs

* don't drink and code boys unless you're goofball or like maybe kor

* for entirely different reasons i mean

* at what point is goofball too drunk to troll but not drunk enough to shitcode

* cool your jets, travis.

* what a TRAVIS-TY

* mush added to yet another blacklist!
2018-03-07 21:34:56 -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
dd5b81c3db Merge pull request #36198 from Cruix/disease_fixes
Disease fixes
2018-03-08 00:03:35 +02:00