RKF45
d35c9954b6
Rework of colour mixing
2014-01-19 21:47:42 +01:00
RKF45
ca4bb831d4
Debug
2014-01-19 12:03:32 +01:00
RKF45
75e66d546a
Rework of colour mixing
2014-01-18 21:09:02 +01:00
Furlucis
7dd5968f76
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-17 03:05:04 -05:00
Furlucis
5268e4f299
Removes the second holywater
...
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.
2014-01-17 02:57:47 -05:00
RKF45
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
Chinsky
cb72e02f23
Merge pull request #4285 from Faerdan/dev
...
NanoUI assets are now sent to the client automatically.
2014-01-12 16:34:10 -08:00
Mark Aherne (Faerdan)
87c246ff06
APC NanoUI
...
* Created new APC UI
* Tweaked Chem Master UI width.
2014-01-12 23:11:49 +00:00
Igor Golubkov
a0b909926b
Fix for broken on spawn chem_dispenser
...
Remove ~83 minute before RnD chem_dispenser starts recharging.
Fix chem_dispenser logic.
Signed-off-by: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org >
2014-01-13 00:25:45 +04: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
943554242a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-09 23:53:34 +10:30
SkyMarshal
2308e71157
Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
2014-01-08 21:33:17 -07:00
Zuhayr
901dbd634d
Indentation fix.
2014-01-08 11:13:36 +10:30
Zuhayr
e8a5b37ea7
Fixed some cocked up checks for alien var.
2014-01-08 10:56:39 +10:30
Zuhayr
049501a898
Added some limited support for alien reagent reactions.
2014-01-08 10:26:39 +10:30
Ccomp5950
e1365598e6
Merge pull request #4213 from Zuhayr/dev
...
Significant diona and species flag changes.
2014-01-06 20:25:12 -08:00
Zuhayr
b28592d707
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-06 13:42:23 +10:30
Mark Aherne (Faerdan)
cdc8b8a40d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-01-06 02:49:50 +00:00
Mark Aherne (Faerdan)
f25052fd4c
NanoUI updates.
...
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).
2014-01-06 02:49:25 +00:00
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
DJSnapshot
7a7eca4393
Merge pull request #4146 from Baystation12/dev-freeze
...
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -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
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
