Commit Graph

200 Commits

Author SHA1 Message Date
Jordie
bdd6a75382 Merge pull request #11119 from phil235/VaporizeMethodReaction
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
duncathan
b58b2694da missed something 2015-08-17 00:13:26 -06:00
duncathan
ca09f34c3a this was a far better solution 2015-08-14 17:26:07 -06:00
duncathan
589c1ed165 components' pipes now show on plating 2015-08-14 15:08:53 -06:00
phil235
d2a4024e7f reagent reaction() now use more methods. Instead of just INGEST or TOUCH, we now have INGEST (for injection, ingestion), TOUCH (for splashing), PATCH (for patch application and blob attack), and VAPOR (for smoke, foam and spray application).
- TOUCH no longer transfer reagent by default, it's now only used for touch based effect like being flammable when touched by fuel or you and your stuff being acided when touched by acid).

- PATCH does no transfer of its own (but actual patches code do make a transfer) but is used for touch effect that ignore clothes and protection (blob attacks, patches effect going through hardsuits)

- VAPOR does reagent transfer but it takes into account clothing protection

Fixes a typo in humanoid/get_permeability_prot
Fixes acid splashing on objects not destroying it. Fixes acid splashing on turf not destroying objects on the turf.

Changed damp rag smothering code a bit.

Blob Smoke now doesn't do anything.
2015-08-09 14:23:12 +02:00
MrStonedOne
94829456d1 Fixes some pipenet bugs in components_base 2015-07-25 23:15:49 -07:00
MrStonedOne
4e971a7e57 Moves build_network to air's initialize, Removes initialize() from atmos machinery 2015-07-25 23:08:02 -07:00
phil235
81255953c7 Merge pull request #10690 from duncathan/atmoshotfixes
Fixes manual valve sprites and n2o scrubbing AND ventcrawling too now
2015-07-19 22:45:54 +02:00
duncathan
7be382cd7f fixes ventcrawling; minor cleanup of a couple other things 2015-07-19 13:13:51 -06:00
Caden Depatie
b5131b49dd saving atmos one letter at a time
fixes a typo that prevents the nanoUI coming up when interacting with the gas mixer
2015-07-19 12:28:41 -04:00
duncathan
b194b1e4af the comment in filters too, why not 2015-07-18 14:45:48 -06:00
duncathan
104c1349a1 fixes manual valve sprites and n2o scrubbing 2015-07-18 14:22:53 -06:00
Remie Richards
57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
2015-07-18 03:45:38 +01:00
Cheridan
77c4ad733d Merge pull request #10593 from MrStonedOne/LifeSupportFailureCheckOxygenLevelsAtOnce
Scrubber Re-balance
2015-07-17 19:51:42 -05:00
MrStonedOne
f4b267ac74 Fixed scrubbers runtiming 2015-07-17 15:48:21 -07:00
duncathan
423abf3355 fixes heaters/freezers and cryo tubes 2015-07-17 14:39:59 -06:00
MrStonedOne
2f255406ac Gives the large portable scrubber 3x3 scurbbing power
Also fixes portable scrubbers a bit

Conflicts:
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
2015-07-16 20:13:02 -07:00
phil235
3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
2015-07-16 14:09:12 +02:00
duncathan
8c2519e115 merge conflicts 2015-07-16 04:54:11 -06:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
duncathan
280373489b fixes things per aran's request 2015-07-16 03:34:18 -06:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
MrStonedOne
38aeb528df Scrubber tweaks + related air alarm tweaks.
Scrubbers now use power.
How much depends on what its doing, how many gases its set to filter, etc.
Scrubbers can now pull from a 3x3 area around them at a major power cost!

Air alarms given some new environmental modes to account for this.
2015-07-13 07:10:07 -07:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
duncathan
0e004e3939 fixes runtimes 2015-07-11 02:47:31 -06:00
duncathan
2a8cd506ef fixes update_icon 2015-07-11 02:47:28 -06:00
duncathan
cf6e258251 fixes parents; gets pipenets working again 2015-07-11 02:47:25 -06:00
duncathan
e63771c9f4 finally gets airs, nodes and parents working... sorta
nodes is working fine as far as I can tell
airs seems fine but it's somewhat untestable until I fix parents
parents is initializing, but not updating properly

also adds my ckey to admins.txt
2015-07-11 02:47:22 -06:00
duncathan
140bbd3972 3rd pass OOP
now we've got lists for parents, nodes, and air mixtures
(they're all broken)
moves tank.dm, cryo.dm, Freezer.dm to components/unary_devices/
2015-07-11 02:47:19 -06:00
duncathan
48282f6485 2nd pass OOP
everything's broken right now, but hey, whatever
2015-07-11 02:47:16 -06:00
duncathan
d5f204b025 fixes update_icon(), fixes welded issue, fixes undocumented(?) issue of the eastern cap on mixers/filters being one pixel too far to the right
the cap thing applied to filters/mixers before this PR, too
2015-07-11 02:47:13 -06:00
duncathan
3c6daf9c76 cleans up ugliness in manual valves; moves the circulator's icons to binary_devices.dmi 2015-07-11 02:47:10 -06:00
duncathan
6f051f9899 refactors update_icon for trinary devices
the base trinary update_icon now adds pipes in the same way all other atmos components do
  no longer overrides icon_addbroken and icon_addintact with its own silly pipe + cap overlay used for filters and mixers
filters and mixers are now oop in terms of icon_addintact (not as much in terms of icon_addbroken)
2015-07-11 02:47:07 -06:00
phil235
d4cdd8eaa1 iron foam is now blue steel color just like aluminium foam.
Fixes metal foam from backpack firefighter watertank.
Fixes nanofrost not freezing shut vent scrubbers.
Atmos backpack watertank now starts full of water.
Change foam layer to Objlayer +0.1 so that it is above foammetalstructure so it doesn't hide the dissolving animation and also above tables.
Buff foam and smoke: smoke/foam contains four times the amount of reagents that was inserted in them, for balancing.
Add a little more smoke clouds for tear gas grenade.
Removed the no longer needed max_lifetime smoke var.
Reagent_dispensers (watertank) now show how much reagents they have left upon examination.
Fixed some code formatting in reagent_dispensers.
Fixes nanofrost temperature lowering effect that wasn't working.
Adjusted reagent volume in blob spore smoke because of the buff.
Change to sorium and ldm: effect varies with created volume.
If you are close to a powerful vortex you are thrown, otherwise you are just moved instead.
Vortex blobs now only make you step if you are far from it when reaction hits, otherwise it throws you. The vortex blob range gets +1 to compensate. Also the range and effect depends on the reagent volume which means lower effect for blobspore smoke.
2015-07-09 19:49:06 +02:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Cheridan
b7dc52856e Merge pull request #9867 from RemieRichards/PipePressureLethality
Pipe Pressure Panic
2015-06-23 00:16:25 -05:00
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
duncathan
9d64ca0e0c makes the game compile
fixes more icon paths
I gave zvent the vent_map icon as a placeholder because it's not like it's even used anyway
2015-06-13 12:33:31 -06:00
duncathan
dab13732fe cleans up icon paths; modifies certain unary devices
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
  they no longer override update_icon() but instead update like just about every other device
  eventually I'll give these real sprites but given that they're unused it can wait for now
  sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
  because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
2015-06-13 02:43:17 -06:00
duncathan
f8033c33de cleans up a bunch of atmos icons
cold_sink.dmi, heat_exchanger.dmi, oxygen_generator.dmi have been merged with unary_devices.dmi
valve.dmi, digital_valve.dmi have been merged with trinary_devices.dmi
  these contained icons for trinary valves; binary valves are already in binary_devices.dmi
pipes2.dmi, dp_vent_pump.dmi, portables_connector.dmi, vent_pump.dmi, pipe_vent.dmi removed
  completely unused/redundant
obj/atmospherics/pipe_tank.dmi moved to obj/atmospherics/pipes/pressure_tank.dmi
obj/pipes/ moved to obj/atmospherics/pipes/
obj/pipes.dmi moved to obj/atmospherics/pipes/simple.dmi
obj/atmospherics/pipe_manifold.dmi moved to obj/atmospherics/pipes/manifold.dmi
removed unused/redundant icon states in simple.dmi
2015-06-12 21:18:18 -06:00
Remie Richards
cccc3446f0 You can now unwrench atmospheric machines with internal pressures greater than their environment, this will throw you away from the machine at great speed, inflicting damage if you hit something hard (walls) 2015-06-09 20:14:12 +01:00
duncathan
f55b70e175 fixes passive gates not colouring 2015-05-28 22:06:58 -06:00
duncathan
041f5ba06a slight reorganization of code/ATMOSPHERICS
puts some things in their proper place
renames unary to unary_devices for consistency
2015-05-27 17:47:54 -06:00
MrStonedOne
33c5a57719 Fixes pipe panic runtime.
These procs are called by the atmos subsystem or during construction when they are needed, so calling them on New() only fucks shit up.
2015-05-23 14:50:13 -07:00
Swag McYolosteinen
287de468ff Merge pull request #9296 from RemieRichards/VentcrawlingFixes
Ventcrawling Fixes
2015-05-14 12:25:11 +02:00
Fayrik
0ba314552a The initial tweaks are in place, ran out of time to finish it though. 2015-05-11 18:54:31 +01:00
Remie Richards
07f1b17a75 Update pipe vision when moving from scrubbers-->vents or vice versa via atmos/pipe fuckery, Fixes pipe vision not updating on login() 2015-05-03 00:13:21 +01:00
MrStonedOne
6d755ba900 Fixes pipe construction bug 2015-05-02 09:07:08 -07:00
MrStonedOne
eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00