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
Zuhayr
84b3512261
Merge pull request #4345 from RKF45/misc
...
Fixes for my earliest commits
2014-01-26 09:16:07 -08:00
Ccomp5950
dfec09ebb2
Merge pull request #4342 from Zuhayr/ihategit
...
Multiz changes.
2014-01-25 20:24:49 -08:00
RKF45
9d24651691
Non-ugly beaker examine
2014-01-25 12:05:16 +01:00
Zuhayr
98177f5a33
Compile fix for what I think was a botched merge with Chemistry-Machinery.dm.
2014-01-25 03:18:48 +10:30
Ccomp5950
3d44e909bd
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 01:39:10 -06:00
Ccomp5950
8ae4e41aaa
Derp merge deconflict error I made when merging master into dev-freeze.
2014-01-23 01:36:32 -06:00
Ccomp5950
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
Furlucis
005d72feb4
Typo fix
...
Fixes a reagent recipe.
2014-01-20 03:20:35 -05:00
Chinsky
8430e0a720
Merge pull request #4319 from RKF45/colour
...
Realistic colour mixing
2014-01-19 21:23:45 -08:00
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
