Ravensdale
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
DJSnapshot
772edffad1
Merge pull request #4700 from Jarcolr/diction
...
Spaghetti isn't called spagetti anymore
2014-04-05 17:05:06 -07:00
Jarcolr
bec699bb7c
Spaghetti isn't called spagetti anymore
...
Didn't change the code/vars/recipes; just fixed the Name line to the
proper spelling.
2014-04-05 18:13:19 +03:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
Ccomp5950
56ef5c165c
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Jim "Apples"
ae2c398b26
Merge pull request #4611 from Aryn/to-master
...
Ctrl-H "faggot" to "meatball" and one icon state change.
2014-03-20 11:22:37 +00:00
Aryn
de86280434
Ctrl-H "faggot" to "meatball" and one icon state change.
2014-03-20 05:05:23 -06:00
Jarcolr
6300e859a2
Fixes #4600
...
Will fix #4600 and the problem with drinks not knowing when they are open/closed.
Hopefully I didn't miss a string of code again,I don't think so,though.
2014-03-17 23:13:29 +02:00
Jeremy Liberman
31c79acd6e
Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
2014-03-16 21:16:31 -05:00
Joey Haas
38d43fa971
Medbay, Xenobiology and Virology now have secure smartfridges.
2014-03-07 21:39:06 +01:00
Joey Haas
78e4f7e126
We now have secure smartfridges. More changes:
...
Changed xeno smartfridge to a secure smartfridge.
Added a chemistry/medical smartfridge for easy chemical storage.
Smartfridge usage now leaves fingerprints.
Secure smartfriges are emagable, by the way!
2014-03-07 21:32:13 +01:00
RavingManiac
b969e680b2
Ingested acid and mutagen will now react after the ten second delay.
2014-03-06 20:20:15 +08:00
RavingManiac
f022a19452
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
maps/tgstation2.dmm
2014-03-06 19:22:06 +08:00
RavingManiac
3b2d3eba05
trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body.
2014-03-05 23:41:42 +08:00
RavingManiac
727b87730b
Smartfridge variations added to chemistry, bar and virology. One of the virology windows didn't have sides, so I fixed that.
2014-03-05 00:03:57 +08:00
Furlucis
01e66b6733
Meat cutting fix
...
The other kind of knife actually exists. This one doesn't.
2014-03-03 02:26:04 -05:00
Ccomp5950
c56ec21ee3
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Mloc-Argent
f5ab084eac
Fixes admin attack logs to show up in-game as well as in the logfiles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-02-25 20:36:46 +00:00
Segrain
9ff5776c9f
Pepperspray safety.
2014-02-03 05:10:04 +03:00
Segrain
1039fc9eaf
Spray sizes.
2014-02-03 05:08:08 +03:00
Segrain
6af8f01cab
Code cleanup.
2014-02-03 05:00:15 +03:00
RKF45
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
RKF45
9d24651691
Non-ugly beaker examine
2014-01-25 12:05:16 +01:00
RKF45
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
RKF45
ab8763378b
Paint mixing
2014-01-11 22:19:02 +01:00
Zuhayr
5cddea72f0
Colour fix for bread slices.
2014-01-11 02:50:49 +10:30
Zuhayr
212eed7e1c
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
2014-01-11 02:47:12 +10:30
Zuhayr
16a28b7338
Added filling_color var to food items for use in sandwiches.
2014-01-11 02:35:10 +10:30
Zuhayr
f23bb5e1fd
Roasted diona, for ZomgPonies/Paradise.
2014-01-10 00:26:23 +10:30
Zuhayr
b28592d707
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-06 13:42:23 +10:30
Zuhayr
5940993694
Removed a return.
2014-01-05 14:20:53 +10:30
Zuhayr
19979562c9
Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel.
2014-01-05 14:20:23 +10:30
Zuhayr
b05f81df3d
Added NO_BLOOD checks to drips, syringes.
2014-01-05 14:13:58 +10:30
RKF45
9b62f7b23d
Small fixes, again
2014-01-04 21:26:28 +01:00
DJSnapshot
b294174acb
Openable soda cans and beer bottles!
2013-12-31 17:52:12 -08:00
Zuhayr
6888651da6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-12-28 23:14:43 +10:30
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
8b0f778a83
Mass updates to paths for blood decals.
2013-12-26 01:56:06 +10:30
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
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
Jeremy Liberman
6afa23a62e
Adds tofurkey and stuffing food items
2013-11-28 03:45:13 -06: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
Mloc-Argent
f1b230edc4
Merge branch 'master' into dev
2013-11-04 10:46:13 +00:00
DJSnapshot
39387fa3bb
Merge pull request #3840 from MDReckless/dev
...
Grape Soda addition
2013-10-29 17:06:16 -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
