GinjaNinja32
0c1aee8074
Fixes <span class='class>, makes Travis check it
2015-07-18 21:13:32 +01:00
PsiOmega
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
PsiOmega
cdb4270f48
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-06 17:31:41 +02:00
mwerezak
1abb52532d
Merge branch 'atmosfix' into airlockfix
2015-07-05 01:20:33 -04:00
mwerezak
bd59733fdb
Fixes #9714
...
Fixes incorrect arguments to calculate_transfer_moles()
2015-07-05 01:18:38 -04:00
mwerezak
6b550f7166
Fixes more instances of = instead of += inside loop
2015-07-05 01:02:52 -04:00
PsiOmegaDelta
48ee872691
Refactors gas analyize.
2015-07-02 15:32:21 +02:00
PsiOmegaDelta
f420dd9f01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
2015-06-30 08:59:34 +02:00
PsiOmega
85d0d6fcd3
Wrenching times no longer runtime.
...
Fixes #9175 .
2015-06-28 18:17:53 +02:00
GinjaNinja32
63ea8338fb
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/ZAS/Diagnostic.dm
code/game/machinery/computer3/laptop.dm
code/game/machinery/requests_console.dm
code/game/objects/items/stacks/tiles/plasteel.dm
2015-06-05 00:49:13 +01:00
PsiOmegaDelta
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
mwerezak
61469d312a
Fixes scrubber power draw
2015-06-02 22:52:35 -04:00
mwerezak
17008aa7ed
Copies vent pump hibernation over to scrubbers
2015-06-02 22:51:45 -04:00
mwerezak
bf231a2925
Fixes #9600
...
All atmos machines now reset last_flow_rate and last_power_draw when
processing.
2015-06-02 22:33:26 -04:00
GinjaNinja32
2c49644ba4
Compile fix
2015-05-30 11:55:47 +01:00
GinjaNinja32
81d23c85cc
code/ATMOSPHERICS \red \blue etc to span classes
2015-05-29 19:36:15 +01:00
PsiOmega
9006419fcd
Creates a default vent for atmospherics tanks.
2015-05-14 15:31:39 +02:00
Chinsky
ad67215b08
Merge pull request #9073 from PsiOmegaDelta/QDels
...
Implementing Destroy():s
2015-05-12 18:26:57 +03:00
Chinsky
c36ac12d9f
Merge pull request #9128 from mwerezak/canister_valve
...
Fixes pressure overshoot when filling nearly empty tanks
2015-05-12 16:29:32 +03:00
PsiOmega
66ead991e7
Terminals, scrubbers, airlocks, and alarms get a Destroy() review.
2015-05-12 08:16:30 +02:00
mwerezak
bab998d011
Improves overshoot when filling air tanks.
...
Estimating the transfer amount assuming that the sink temperature remains unchanged, and then using that estimate to obtain an estimate for the final sink temperature. This is then used to obtain a final transfer amount in predictor-corrector fashion.
2015-05-11 22:58:44 -04:00
Mloc
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
PsiOmega
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
PsiOmega
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
PsiOmega
d8a6576f36
Examination fixes.
...
Fixes #8491 .
Fixes #8579 .
2015-04-06 10:46:19 +02:00
PsiOmega
8e55ad8114
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
PsiOmega
fd8e6f9f32
Corrects the spelling of MINIMUM_MOLES_TO_PUMP.
2015-04-03 09:23:34 +02:00
PsiOmega
4326b8c5d8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-03 09:22:23 +02:00
mwerezak
a116723fcd
Updates canister process() to use atmos helper procs
2015-04-02 00:04:44 -04:00
Den
7f89a145b9
#define CONNECT_TYPE_HE 8
2015-03-26 16:31:13 +02:00
Den
29e5b9e63b
Update he_pipes.dm
2015-03-26 16:27:13 +02:00
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
PsiOmega
e7653e1ed5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-26 08:22:25 +01:00
mwerezak
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
Atlantiscze
228651be1c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-23 08:03:57 +01:00
Chinsky
2d03c412f7
Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor
...
Examine Tab 2: Revenge of the Refactor: Reloaded
2015-02-22 11:32:32 +03:00
Neerti
3f16754e89
Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.
...
The entire system is now self-contained inside a module folder.
Also fixes a runtime I made because ghosts lack a mind (and so do I)
2015-02-20 08:04:17 -05:00
PsiOmega
d32cffaefe
NanoUI air alarm interface. Remote support lost.
2015-02-19 18:23:25 +01:00
Atlantiscze
2d4926f72d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-17 16:05:47 +01:00
RavingManiac
cc62c987ea
Some TEG refactoring and UI improvements
...
"circulator/heat exchanger" is now just called "circulator"
2015-02-13 18:34:48 +08:00
RavingManiac
71902cdca2
Tweaked descriptions and settings of various TEG components.
...
Maximum power of core vent and injector increased.
2015-02-13 16:08:52 +08:00
RavingManiac
98dd5c46c0
Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines.
...
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.
Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.
TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
2015-02-13 00:38:23 +08:00
Atlantiscze
89496ce927
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power
2015-02-11 01:49:06 +01:00
Atlantiscze
12be20ed73
Mapping changes preparation
...
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
Kelenius
e6dc9d36fd
Update for machine upgrades and some science
...
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
Zulker Nayeen Nahiyan
0a3f523066
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
...
Conflicts:
code/__HELPERS/maths.dm
code/__HELPERS/type2type.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/rig/rig_pieces.dm
code/modules/clothing/spacesuits/rig/suits/light.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/utility.dm
code/modules/events/event_manager.dm
code/modules/mob/living/living.dm
code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky
c3559556a0
Merge pull request #8027 from Baystation12/dev-freeze
...
Wiz freeze
2015-02-03 18:23:18 +03:00
Chinsky
aa7fde250c
Merge pull request #7801 from Mloc/bs12-glowypipes
...
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00