Commit Graph

492 Commits

Author SHA1 Message Date
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
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06: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
39383c331a Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-02-26 09:38:40 -06: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
Chinsky
0ba65efd18 Merge pull request #4477 from Ccomp5950/runtimefixes
Runtimefixes
2014-02-25 06:01:59 +04:00
Segrain
bd5585052c Fix for #4479. 2014-02-25 03:33:18 +03:00
Ccomp5950
0f538a9b2f Typo fix.
Screw typechecks and their need for closing parens :*(
2014-02-24 01:50:44 -06:00
Ccomp5950
cea151813e Runtime fix: Dirt in SPAAAAACCEEEEEEE
ndefined variable /turf/space/var/dirt
proc name: reaction turf (/datum/reagent/space_cleaner/reaction_turf)
source file: Chemistry-Reagents.dm,939
2014-02-24 00:44:00 -06:00
Segrain
ef3b565f64 Fix for #4458. 2014-02-22 06:53:37 +03:00
Loganbacca
f593232aa5 Reagent reaction_mob/turf tweaks
- Adds an if() check to reaction_mob for catching a very rare runtime related to mobs inhaling smoke reagents from just deleted smoke.
- Carbons reaction_turf proc now modifies a single dirt overlay layer, instead of just adding more decal objects to the turf.
- Added some checks to the radium and uranium reaction_turf proc so it doesn't stack multiple greenglow decals.
- Performed colon removal surgery on thermites reaction_turf proc, also tweaked it's overlay operation to correctly overlay a chemical puddle effect, instead of a melted wall effect.
- Removed space_cleaners overlays.Cut() code, since it was removing decals from turfs.
2014-02-22 00:56:12 +13:00
Loganbacca
864e097e91 Chemsmoke rewrite
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.
2014-02-22 00:47:08 +13:00
Loganbacca
d378eb0692 Chem grenade fix
Missed this in my last commit:
- Added a result amount for chemsmoke so it calculates the created_volume correctly
2014-02-14 15:44:45 +13:00
Loganbacca
02810f7e89 Chem grenade fixes
Fixes #3986

- Foam reagent inheritance fixed:
The trans_to() proc in Chemistry-Holder.dm was calling handle_reactions() every time it would add and remove reagents with add_reagent() and remove_reagent(). I've added a safety flag to both of these procs (and copy_to()) so that trans_to will not call handle_reactions() until it has added all the reagents to the target container. This allows foam to reliably take on the properties of other leftover reagents.

- Fixed a bug in effect_system.dm that wasn't applying reagents from foam to the environment.

- Tweaked smoke to apply reagent effects after it has stopped moving
This was causing huge reagent spam at the center of the smoke cloud as it was spawning, since they were being applied every time the cloud of smoke moved. Also changed it to apply the effects 2-3 times at longer intervals (2 seconds).

- Smoke also only effects tiles in a 3x3 grid now, rather than 5x5.

- Summary:
Chem smoke does slightly less damage (if it contains damaging reagents)
Chem smoke proc calls reduced by 60-70% (significant lag reduction)
Foam works properly again
Foam proc calls reduced by 70-80%
2014-02-13 00:15:02 +13: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
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