Commit Graph

427 Commits

Author SHA1 Message Date
DJSnapshot
7a7eca4393 Merge pull request #4146 from Baystation12/dev-freeze
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -08:00
SkyMarshal
30970b7b56 Hypothetically adds proximity check to droppers.
This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check.
2013-12-26 21:22:00 -07:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Chinsky
19c83de6af Applying Minifix to Yinaderp
ID of resulting chemical was not set, so reagents just disappeared
2013-12-22 07:55:03 +04:00
Zuhayr
c4b847e9c6 Amendment to chemistry beaker range fix. 2013-12-18 23:54:11 +10:30
Zuhayr
9f9b5285d8 Fixes #4058 2013-12-18 00:24:21 +10:30
DJSnapshot
c32df3852e Added checks so that space cleaner reagent and borgs can clean floors now too! 2013-12-16 22:07:54 -08:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2
DNA2 - A recode of DNA
2013-12-05 02:39:55 -08:00
Zuhayr
74fe8cd76a Somehow managed to break this during merge resolution. 2013-12-03 22:42:22 +10:30
Rob Nelson
53c2aff420 DNA2 - A recode of DNA
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
2013-12-01 00:04:27 -08:00
Zuhayr
e90fd95a22 Merge resolution. 2013-12-01 15:19:29 +10:30
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze
Conflicts:
	html/changelog.html
2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev
Conflicts:
	icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze
Conflicts:
	html/changelog.html
2013-11-30 05:11:36 +04:00
Zuhayr
794ca4064e Merge resolution. 2013-11-29 22:36:36 +10:30
Zuhayr
9c4b4c2817 Merge resolution. 2013-11-29 22:34:09 +10:30
Jeremy Liberman
6afa23a62e Adds tofurkey and stuffing food items 2013-11-28 03:45:13 -06:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Ccomp5950
e684b69741 Fixed a runtime issue with demonsblood. Was causing runtimes because data was inheriting the bloods data var (which is a list).
The drink will still maintain it's reagents and data vars but when ingested and procesed the blood is ignored.

Downsides, you can't get sick from ingesting blood in a drink (which..you shouldn't anywho)

Possible future updates:  since blood is an amnetic substance make the person have nausia for ingesting it if quantities are high
2013-11-23 20:21:51 -06:00
Ccomp5950
9e4e46cf44 Removed soda items from Booze dispenser 2013-11-23 04:49:02 -06:00
Ccomp5950
df7c877da7 Space Soda should now show up in the Soda Dispenser 2013-11-23 02:02:14 -06:00
Ccomp5950
3a177a95c4 And fix so Space Cola shows up too. 2013-11-23 01:50:17 -06:00
Ccomp5950
ec79e75c0f Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser
Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.

Also removed my debug messages
2013-11-23 01:43:34 -06:00
Ccomp5950
91c56c6e77 Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers.
Typo fix:  Added taquilla back in, it's ID wasn't correct in the reagent list for booze dispenser.

added watermellon juice to the soda machine.

Todo:  Fix NanoUI for these to now mention beakers, and have enough space to list watermellon juice
2013-11-22 21:46:11 -06:00
Zuhayr
abd17deb5b Fixes #3962 2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207 Clamps pill numbers between 1 and 20. 2013-11-23 13:47:20 +10:30
Zuhayr
32b2009c25 Diona will take five times as much damage from plant-B-gone as previously. 2013-11-20 18:26:55 +10:30
Zuhayr
542104478f Commented out the Sec-healing component of sprinkles. 2013-11-20 18:18:55 +10:30
Nanai
e87b59f75b Minor Painkiller Rework
Added a proper lid for scaling on paracetamol, added in the ability to get high off of painkiller overdoses.
2013-11-15 19:27:10 -05:00
Nanai
7786e7a96c Sleeper Addition, Chemical Rebalance 2
Tweaked soporific and new chems a bit more. Added Paracetamol, a lesser drug to tramadol, known to all as tylenol, and implemented it into sleepers! Gave inaprovaline the IB slowing property to keep sleepers in the game and allow EMTs better usage. Oxycodone made easier to craft by making the plasma a catalyst, but decreased it's overdose limit. Applied oxycodone and paracetamol to be able to handle things painkillers should.
2013-11-14 19:11:31 -05:00
Nanai
160e0f9ee8 Poultice potency, bugfixes
Herbal poultice effectiveness now scales with potency of base herb.
2013-11-14 15:21:29 -05:00
Nanai
a104453156 Added and Adjusted Chemicals
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.
2013-11-14 13:08:30 -05:00
Nanai
cba1a9585d Medical Hoopery
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.

Updated the sleeper to allow for ejection of the beakers and occupants in panel.

Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.

Laid the groundwork for mechanical and assisted internal organs.

Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Kilakk
ee34d281f9 Fixes #3890, gave Aloe a more reasonable boozepwr 2013-11-07 18:54:42 -05:00
Chinsky
65c248cda0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma 2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Iamgoofball
2c30455b10 Grammar tango, spotted and eliminated. 2013-11-02 15:33:22 -07:00
Iamgoofball
ca741fbdd7 Two booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list. 2013-11-02 15:09:04 -07:00
DJSnapshot
39387fa3bb Merge pull request #3840 from MDReckless/dev
Grape Soda addition
2013-10-29 17:06:16 -07:00
DJSnapshot
8bb22f7e18 Merge pull request #3846 from Iamgoofball/boozetaketwo
Fixed a CATASTROPHIC GAME-CHANGING BUG with the Soda Dispenser that resulted in much immersuhan breaking: Grape Soda wasn't in the Soda Dispenser dispensable reagents list.
2013-10-29 17:03:54 -07:00
Iamgoofball
a4737f3b22 Added GRAPE DRANK to the Soda Dispenser. 2013-10-29 16:56:50 -07:00
MDReckless
5a8a629df7 Update drinkingglass.dm 2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-29 05:33:23 +10:00
MDReckless
e6d42432ff Changed grape soda description 2013-10-28 15:03:30 -04:00
MDReckless
152d83d47c Update drinkingglass.dm 2013-10-28 15:02:14 -04:00
MDReckless
39d312e69d Removed grape juice from unneeded area 2013-10-28 15:00:21 -04:00
MDReckless
811a4b1aa9 Adds Grape Soda as a reagent
Allows grape soda in a beaker and gives it color
2013-10-28 14:57:08 -04:00
MDReckless
809a7faf58 Adding Grapes to the Juicer allow list
Grapes grown from hydroponics can now be juiced
2013-10-28 14:45:36 -04:00