Commit Graph

77 Commits

Author SHA1 Message Date
Jordan Brown e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04:00
ShizCalev cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04:00
AnturK 52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK 4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
kevinz000 b2f860620a fixes cqc working outside chef assigned areas (#37375)
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
2018-04-24 11:23:32 -04:00
AnturK 5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02: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
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
Ian Turk fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05: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
Iamgoofball ba570ad32d Fixes the name on the cook's culinary school training (#35635)
Totally forgot to do this
2018-02-15 00:05:52 -05:00
Iamgoofball 4b9360d959 The Cook now only works under siege. (#35597)
The chef's CQC skill now only works in the kitchen area
2018-02-14 09:18:26 +13:00
ShizCalev bf901492bf Fixes invalid throwat args (#35565) 2018-02-13 14:13:48 +01:00
XDTM 5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664)
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
ThePainkiller c5e8a09bd2 fix/spellcheck: Changes command error on cqc.dm (#34634)
* Update holy_weapons.dm

* Update cqc.dm
2018-01-19 09:56:21 -05:00
Ian Turk c7f00fb44c Prefixed all disability defines with DISABILITY to fix name collision with BYOND built in BLIND define 2017-12-22 23:49:41 -06:00
XDTM 146d167189 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
* Refactors disabilities into lists, allowing for independent disability sources

* defines

* Xhuiiiiissss

* living

* did that

* adjusted for traumas

* Updates pacifism and removed remove_all_disabilities from fully_heal to prevent issues.

* makes antur happy
2017-12-18 22:20:07 +01:00
XDTM b5d9845edf [Ready]Brain Trauma additions (#33405)
* Brain Trauma additions

* Adds Aphasia

* Adds the aphasia language

* Short window

* nuke exploits GONE

* fixes draggable portals

* psychobrawl won't just kill you if you use it too much, but stuns longer

* Adds anosognosia, and lowers thresholds

* .

* RANDOM GODWOKEN

* Default brain damage is now 0

* antur

* fix 1

* forcemove and afk friend adjustments

* okay it's ready now

* dead people can hear imaginary friends
2017-12-17 18:10:25 +01:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
XDTM 550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
Emmett Gaines 7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom 2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev b0f24a892b Fixes bartender suit having an adjust state (#32968) 2017-11-22 13:40:11 -05:00
oranges 515428f63f Merge pull request #31500 from Armhulen/patch-7
sleeping carp grabs now put out a message
2017-10-12 11:09:48 +13:00
Armhulen f73c003bd2 a fix is a fix 2017-10-09 07:20:31 -07:00
MrStonedOne c8bb13d7c2 In which the stoner one gets stoned and tries to address tick contention... again
Tick contention is when the mc, sleep()/spawns(), and byond internal processing fight each other for game tick time. Usually in an unproductive way that wastes cpu cycles and reduces the effective amount of game tick to go around.

Tweaked the anti-tick contention heuristics of the MC a touch.

Fixed an incorrect operator in the mc's anti-tick contention heuristics causing it to apply in times of no lag rather then times of lag.

The mc's anti-tick contention heuristics now plays better with the high pop processing mode.

We no longer reserve the tail end of a tick for the mc to have if the mc doesn't plan to run next tick because of high pop mode or anti-tick contention heuristics.

stoplag() can now be given an initial delay allowing it to act like a smarter sleep (in that it sleeps for longer if the server is overwhelmed.

All short sleeps that only existed for performance reason and had no game play, visual/audio, or balance reasons behind their timing were converted to stoplag().
2017-10-09 01:21:43 -07:00
Jordan Brown b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -04:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Jordan Brown f3ca2fd5b5 Some names -> string 2017-09-26 15:59:57 -05:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ashe Higgs 0a32812982 Separates actions.dmi into multiple files (#29587)
actions.dmi is way too cluttered and messy, and with inhands getting the axe I decided to fix this, too. I separated the major categories of actions into their own files, like antagonist-specific actions and spells. A full list of categories is found here:

    actions_AI.dmi contains AI-specific actions;
    actions_clockcult.dmi contains clockcult-specific actions, and scripture quickbind icons;
    actions_cult.dmi contains cult-specific actions as well as sintouch;
    actions_flightsuit.dmi contains flightsuit and flightpack actions;
    actions_items.dmi contains minor item-specific actions such as the hierophant club and jetboots;
    actions_mecha.dmi contains actions related to mechs;
    actions_minor_antag.dmi contains antag-related actions with no other spot, like devils/abductors;
    actions_revenant.dmi contains revenant ability icons;
    actions_silicon.dmi contains minor silicon and console icons, like pAI and xenobiology consoles;
    actions_slime.dmi contains slime actions;
    actions_spells.dmi contains icons for all spells;
    actions_xeno.dmi contains icons for all xeno actions; and
    backgrounds.dmi contains backgrounds for the action buttons.
2017-08-01 14:26:42 +12:00
ShizCalev d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
kevinz000 7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
Really-Good-Soda-Flavor d23c6f910d Checks for temporary martial arts on mind transfer (#28746)
* Checks for temporary martial arts on mind transfer

* Makes transferring its own proc

* Makes sure martial arts are qdeleted on removal

* Improves teaching and removing
2017-07-04 11:34:05 +02:00
Joan Lung deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
Joan Lung 58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10:00
Jordan Brown 50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04:00
Jordan Brown 1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
oranges 186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
Joan Lung 563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04:00
Joan Lung 2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Really-Good-Soda-Flavor 41294bd58d Reorganizes martial arts and stores them in the MIND. (#27324)
* Reorganizes martial arts and stores them in the MIND.

* Moves martial arts to mind.

* Added more sanity checks

* MORE sanity checks!

* Fixes the checks.
2017-05-22 14:12:27 +02:00
Davidj361 5751c31f81 Fixes issue #25061 with krav maga (#26103)
* Fixes issue #25061 about krav maga
- Krav maga now gets its abilities toggled if you click the same ability twice

* Fixes issue #25061 about krav maga
- Krav maga now gets its abilities toggled if you click the same ability twice
2017-04-12 18:55:19 -06:00
Cyberboss 2027392ee8 Kills more spawns (#25528)
* Die

* Die

* Die

* Fix

* Die

* Die

* Alright

* Whoops

* bluh

* < can't code
2017-03-28 13:32:20 +02:00
oranges 60a9891994 Tweaks to logging around disarms, general code cleanup (#25329)
The mob add_log helper has been improved to be more readable and do less
work over and over

Disarms now log the item they disarmed if applicable
Some found old code was chopped out and improved
2017-03-25 19:29:49 +01:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Kyle Spier-Swenson 280dbe20c3 [Ready] SSthrowing + callbacks! (#22476)
* SSthrowing + callbacks!
Throwing is now a subsystem.
It's low priority, but is a ticker subsystem so is ran before most other subsystems.
To allow for shit to run after the throw finishes, throwing now supports a callback.
A callback datum system was created, conversion of addtimer is planned for another PR.
Throwing now has a limit of 2048 turfs (was 600)
Throwing now ticks every world.tick, and properly converts the speed arg from 1ds to what ever tick_lag is.
Throwing now properly accounts for missed ticks.
Throwing no longer uses sleep.
Throwing should no longer lag since it's not filling the sleep queue up

* Smoother tentacles

* Some improvements

* Missed a spot.

* Makes shit quicker.
Inlines the thrownthing.tick() proc.
Raises missed ticks value
Lowers max dist value
Inlines the two sister overrides for /atom/movable/Moved() because that just seemed like a waste

* >PRs open that use procs i'm removing.

* STOP THE PRESSES!

* throw_at now runs the first throw tick() immediately
This will help some with throwing while running.

* Item throwing now imparts the momentum of the user throwing.

(ie, running in the direction you are throwing makes you throw faster, running away from the direction you are throwing makes you throw the item slower)

* Moves throwing momentum from carbon/throw_item to movable/throw_at.
There are other things that cause a mob to "throw" an item, I figured we keep this universal since thrower is already an arg.

* Explosions throw shit faster.
This was stupid, "Hey, lets set the item's throw_speed to 4 so embedding works, but lets make it throw at the base 2 throw speed for no reason."

* Fixes explosion embedding.
This also acts as a nice example of how to override a callback in an override of throw_at properly.
2017-01-02 20:08:03 +11:00
Mervill b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
PKPenguin321 44594790a9 krav maga touchup (#21337)
* krav maga touchup

Fixes a bad check for when to play the kick hitsound

* clamps losebreath/silence on lung punch/neck chop to 10

also tweaks leg sweep desc

* hopefully fixes the clamps
2016-11-04 13:29:42 +01:00