Atermonera
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
Leshana
393673baa4
Merge air_master into SSair, now its all one type
2018-01-27 01:59:25 -05:00
Leshana
4c8bce00b4
Preliminary implementation of ZAS as a StonedMC subsystem.
...
* Creates the SSair subsystem which replaces the Setup, Start(), and Tick() procs of air_master.
* It may be best to have SSair completely replace air_master, but for now we are having them work together. It does completely replace the old processScheduer air ticker however.
* Remove the obsolete Setup and Tick procs.
* Adjust admin and debug verbs that dealt with some ZAS internals to work with the new implementation.
2018-01-27 01:59:24 -05:00
Leshana
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
Neerti
495f985022
Travis Appeasement Mark II ( #4485 )
...
* Tries to Please Travis
Should remove all active edge problems.
Moves map-specific unit tests to the map define file.
Enhances some PoIs in terms of adding /ignore_mapgen to the ground.
Fixes incorrect loot pile in one PoI.
* Conflicts are fun.
* Might fix unit test.
2018-01-01 22:26:31 -05:00
Arokha Sieyes
2f918f1041
Make ZAS setup and init delays work
...
They didn't work due to bay differences in UNIT_TESTING activation defines
2017-05-15 01:34:45 -04:00
Anewbe
1feba48827
Ports MultiZAS
2017-05-04 21:13:53 -04:00
Anewbe
cce1fcc1f5
Ports MultiZAS
2017-05-04 19:51:54 -04:00
Hubblenaut
b994a07dc2
Fixes duplicate gas layers
2015-12-15 13:32:01 +01:00
PsiOmega
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
PsiOmegaDelta
d293b9ea25
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/ZAS/Controller.dm
code/modules/admin/verbs/adminsay.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/stripping.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-08-27 08:53:22 +02:00
mwerezak
ec7f60f9ad
Allows indirectly connected turfs to merge zones if either zone is small enough.
...
Fixes #9235
Conflicts:
code/ZAS/Controller.dm
2015-08-26 14:25:43 -04:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
9d90691605
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
mwerezak
17a84d9dd3
Hotfix for #9235
...
Hotfix for master
2015-06-13 13:37:37 -04:00
Zuhayr
1bb063041b
Merge pull request #9718 from mwerezak/zonemerge
...
Allows small zones to merge even if zone-blocked
2015-06-07 15:13:09 +09:30
mwerezak
03412a24f8
Allows indirectly connected turfs to merge zones if either zone is small enough.
...
Fixes #9235
2015-06-06 23:24:11 -04:00
GinjaNinja32
e8f02b8496
Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS
2015-05-29 20:36:48 +01:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
mwerezak
277103f1cd
Fixes tiny door zones
...
Fixes #8987 by deferring the update of self-zone-blocked turfs until after non-self-zone-block turfs have updated (and thus have valid zones).
2015-04-29 13:01:26 -04:00
PsiOmega
eca7569077
Clean server start.
...
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
2015-04-18 15:32:25 +02:00
Mloc-Argent
debba68c44
add sleeping for ZAS connection edges
...
Edges will sleep and fully balance if compare() passes.
also some small small xgm tweaks.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:35:40 +00:00
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Aryn
6c91d220b8
Added code protecting against obscure merges of invalid zones.
...
- Usually happened when welding fuel tanks caused secondary explosions.
2014-02-22 08:45:31 -07:00
Aryn
d0c0315d53
Added documentation, split ConnectionManager.dm, removed some unused procs.
...
Added a proc to find the other zone in an edge for future procs.
Fixed the stupid .int again.
2014-02-21 08:39:04 -07:00
Aryn
0089ae6282
Fixed some weird bugs concerning space and the creation thereof.
2014-02-21 08:39:04 -07:00
Aryn
0814bdb36f
Added some documentation.
2014-02-19 18:24:37 -07:00
Aryn
a2d992ef5c
Fixed inexplicable reversions.
2014-02-19 17:11:09 -07:00
Aryn
bc971b01ea
New ZAS version, stable and efficient. Git broke the everything so it's in one commit.
2014-02-19 16:47:53 -07:00
