Commit Graph

2377 Commits

Author SHA1 Message Date
Jordan Brown 8bde56fd5a Merge pull request #34553 from ShizCalev/abstract-transfertoloc
Fixes being able to place abstract items in fridges & chem dispensers
2018-01-18 17:47:48 -05:00
Ordonis 27bb0d4f18 Adds a Recipe for morphine to medicine (#34541)
* Adds a Recipe for morphine to medicine

Exactly what it says on the tin.

* Ketrazine

Adds ketrazine, a combat stimulant with severe consequences for use.

* Revert "Ketrazine"

This reverts commit d618fe337cc28f5513c59ff3399894c10dde4a7d.
2018-01-18 15:06:27 -06:00
ShizCalev 2cf6cafa78 Fixes being able to place abstract items in fridges 2018-01-17 16:49:49 -05:00
Jordan Brown a3d3c93fa3 Merge pull request #34463 from DaedalusGame/micro_fix
Fixes duplicate reagents in chemistry macros
2018-01-16 08:39:06 -05:00
XDTM 76b5ee3966 Xenobiology Species Rework (#34166)
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
2018-01-16 11:07:06 +13:00
BordListian a196791f90 - Fixes duplicate reagents in chemistry macros 2018-01-15 13:39:15 +01:00
Leo 1572607f65 Merge pull request #34372 from YPOQ/slimestopfix
Fixes players not being immune to their own slime timestops
2018-01-15 01:35:39 -02:00
ShizCalev 3d08996463 Replaces cached get_area vars for names (#34338) 2018-01-13 21:55:47 -05:00
Leo 28801ac5db Merge pull request #34360 from kevinz000/patch-429
Fixes clownborg sprays not recharging
2018-01-13 17:25:07 -02:00
oranges 30ea4d1a38 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 23:21:58 +13:00
YPO ca688bc7cd Fixes players not being immune to their own slime timestops 2018-01-12 12:25:00 -07:00
kevinz000 ab85235c7b Fixes stimulum running out before the next breath (#34296) 2018-01-12 17:04:12 -02:00
kevinz000 aca01e3553 Update spray.dm 2018-01-12 06:37:37 -08:00
oranges eb9180d7d6 Merge pull request #34204 from ShizCalev/chem-macro-feedback
improves chem macro feedback
2018-01-12 09:02:15 +13:00
Leo 26d4e05d3d Merge pull request #34229 from Robustin/deconversionfix
Fixed cultists deconverting via holy water not giving a message
2018-01-10 19:46:01 -02:00
ShizCalev 998bb2ec27 improves chem macro feedback 2018-01-09 15:15:17 -05:00
Robustin 30124c7be8 Deconversion fix 2018-01-09 13:15:40 -05:00
MoreRobustThanYou ed0195be4f Chemisty recipe macros (#34149)
* Chemistry recipe macros

* Fix energy not being drained

* reee tgui travis

* Finishing touches
2018-01-07 19:48:55 -05:00
ShizCalev c4496dbd72 Consolidates bot assemblies under one parent 2018-01-07 13:43:46 -05:00
ShizCalev 18892a0dc5 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp (#34134) 2018-01-07 15:01:26 -02:00
vuonojenmustaturska 67051f37c8 You can taste oil (#34046) 2018-01-03 16:05:43 -05:00
XDTM 5d761c5605 [Ready]Adds the Pax reagent, small tweaks to pacifism (#33663)
* adds pax

* fixes and feedback

* Blanket disability fixes

* revert fix

* unlist

* update

* .
2017-12-29 03:37:10 -05:00
Robustin f5d26a4dd5 Fixes ethanol + book reaction message (#33867) 2017-12-28 18:53:47 -02:00
oranges 43382b08e7 Merge pull request #33868 from Robustin/EMPruntime
Fixes EMP runtime
2017-12-28 23:08:06 +13:00
oranges 9d0e97fc8d Merge pull request #32311 from kevinz000/component_forensics
MoreRobustThanYou's datum forensics but it's a component this time.
Fully refactors forensics, including fingerprints, hidden/admin fingerprints, suit/clothing/whatever fibers, and blood DNA residue to /datum/component/forensics.
Adds support for manually adding fingerprints.
🆑
code: Forensics is now a datum component.
balance: NPC humans will now start leaving fingerprints on things they touch!
/🆑
2017-12-28 10:18:11 +13:00
Robustin 04a250009f Fixes EMP runtime 2017-12-26 16:53:37 -05:00
Emmett Gaines 4595c46dca turns the baseturf var into a part time list (#33705) 2017-12-25 20:10:08 -05:00
kevinz000 05be346f8a Component Forensics, Blood Decals, and Cleaning 2017-12-24 18:19:43 -08: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
Jordan Brown 63e92a03c8 Merge pull request #33745 from vuonojenmustaturska/oilfix
[s] Fixes the frying oil reagent
2017-12-22 12:02:42 -05:00
kevinz000 6ce550dadf Clownborgs (#33590) 2017-12-22 11:57:02 -05:00
vuonojenmustaturska af2aae794c frying oil fix 2017-12-22 03:06:02 +02:00
MoreRobustThanYou 408a6c09b5 Fix smoke machine runtime (#33697)
* Fix smoke machine runtime

* Woops.
2017-12-21 01:41:01 -05:00
ACCount 40699a8aea [READY]Refactors reagent container types (#33470)
* Replaces a bunch of manual OPENCONTAINER checks with helper procs

* Removes unnecessary vars

* Updates reagent bitflags, adds some new ones

* Replaces most of the is_open_container calls with more specific ones

* Puts new AMOUNT_VISIBLE flag to use

* Uses new helper procs in more objects

* Standardizes chemicals logging

* De-snowflakes two more checks

* Fixes

* Minor fixes and improvements
2017-12-18 22:55:01 -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
nicbn 4d4f091386 Makes the chemical smoke machine use stock parts for things (#33510)
* Makes the chemical smoke machine use stock parts for things

* makes code better

* Undoes the nerf

* tgui now updates

* now the machine spits

* minnotmax

* Allows usage of more parts

* ta-da

* Update smoke_machine.dm

* Update smoke_machine.dm
2017-12-18 10:06:07 -05:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Ashe Higgs d447acdc6e All-In-One grinder results are now defined by type, not by huge lists (#33181)
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding.

This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled.

I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
2017-12-15 10:48:25 +13:00
ACCount12 0148462f7d Fixes yet another chem explosion throwing warnings 2017-12-12 12:52:33 +03:00
coiax e7e33b3004 Silver slime extract foods now fry correctly (#33309)
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
2017-12-10 18:41:59 -05:00
ACCount 62be5943b0 Improves the way chem machines handle qdel, fixes some runtimes (#33415) 2017-12-10 14:24:42 -05:00
ACCount 1dd86ea128 Fixes meth explosion throwing warnings (#33356) 2017-12-09 02:09:28 -05:00
oranges eddf889598 Merge pull request #33341 from ShizCalev/31-bottles-of-beer
Fixes mugs being called "broken bottles"
2017-12-08 22:24:37 +13:00
ShizCalev c3383d1520 Fixes mugs being called "broken bottles" 2017-12-07 13:52:03 -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
Kyle Spier-Swenson 8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000 8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
ShizCalev 2abae67fd0 Cleans up goldcore defines (#33090)
* Cleans up goldcore defines

* Tweaked commentary.
2017-11-26 16:51:54 -06:00
Mark9013100 e6ec0f267b Oldstation edits/fixes (#33080) 2017-11-26 01:01:03 -05:00
oranges 73b25d7ef2 Refactor on_reagent_change to pass through the change type (#32805)
this is purely so the smoke circuit can reset the notification only when
reagents are actually added to it
2017-11-24 12:45:44 +01:00