mwerezak
fd7830fd1b
Adjusts most catalysts values
2015-05-30 17:21:33 -04:00
mwerezak
2d92a871aa
Optimizes reaction checks
2015-05-30 17:21:05 -04:00
mwerezak
33487c76fa
Implements reaction-over-time and reaction yield
2015-05-30 16:44:24 -04:00
PsiOmega
2f1202d5e0
Airlock fixes.
...
Changes door closing to use the same sound playing setup as door opening. Fixes #9559 .
2015-05-30 20:41:25 +02:00
mwerezak
783b5aecc9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robolimbs2
...
Conflicts:
code/modules/mob/living/carbon/human/human_organs.dm
2015-05-30 14:31:19 -04:00
Zuhayr
b3102824a0
Fixes #9544
2015-05-31 03:56:06 +09:30
mwerezak
cbeaabee9c
Replaces setting ORGAN_ROBOT flag with robotize() call
2015-05-30 14:25:53 -04:00
mwerezak
40d437f988
Assigns w_class to external organ types
2015-05-30 14:24:46 -04:00
mwerezak
92de9fb432
Replaces health assignments with max_damage
2015-05-30 14:20:50 -04:00
Zuhayr
ae38961a65
Fixes #9551
2015-05-31 03:36:07 +09:30
Zuhayr
f9e99e1ee9
Fixes #9581
2015-05-31 03:34:29 +09:30
Zuhayr
bf1733640a
Fixes #9586
2015-05-31 02:56:54 +09:30
Zuhayr
c2c8911aed
Additional IPC tweaks.
2015-05-31 02:30:57 +09:30
Zuhayr
388b2612b0
Fixes #9488
2015-05-31 01:43:06 +09:30
Zuhayr
ff5c815d01
Fixes #9487
2015-05-31 01:38:04 +09:30
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
GinjaNinja32
94e19592cf
objects/effects, objects/structures
2015-05-30 14:37:40 +01:00
GinjaNinja32
dfd871f168
code/machinery, fix for code/antagonist merge string causing false positive
2015-05-30 14:05:32 +01:00
mwerezak
6dbd565079
Merge remote-tracking branch 'upstream/dev' into robolimbs2
2015-05-30 08:32:31 -04:00
GinjaNinja32
2c49644ba4
Compile fix
2015-05-30 11:55:47 +01:00
PsiOmegaDelta
12d1277925
Merge pull request #9577 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d
Merge pull request #9553 from GinjaNinja32/reagent_protection
...
Fixes #5945 , de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr
40780165a2
Merge pull request #9569 from comma/master
...
Fixes corpses and unconscious people still showing typing indicators.
2015-05-30 12:36:14 +09:30
Chinsky
f61380adfc
Merge pull request #9576 from GinjaNinja32/shuttle_logging
...
Shuttle improvements
2015-05-30 03:15:18 +03:00
Chinsky
44db730482
Fixes corpses and unconscious people still showing typing indicators.
...
Indicator also has same visibility as the owner, so no magicaly sensing where someone is going to talk soon (chat bubbles works well enough)
Since images do not have visibility, had to make it an object decal. Also since it's set per mob, it's no longer global. Shouldn't really be much of an issue, since it's only created when mob tries to speak (so ~60 objects total on high-usual load)
2015-05-30 03:13:45 +03:00
PsiOmega
bf27545841
End game turf changes now simply alters color.
2015-05-29 23:38:09 +02:00
PsiOmegaDelta
139b868143
Merge pull request #9574 from GinjaNinja32/close_your_damn_spans
...
Closes some span tags
2015-05-29 23:30:30 +02:00
PsiOmegaDelta
aa165cf7c5
Merge pull request #9555 from GinjaNinja32/welder
...
Fixes welder overlay with welding goggles plus breacher suit
2015-05-29 23:30:13 +02:00
GinjaNinja32
d09cd2fe57
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/jobs/job_controller.dm
code/game/verbs/ooc.dm
2015-05-29 21:55:37 +01:00
GinjaNinja32
de4f085057
code/game, excluding code/game/machinery and code/game/objects
2015-05-29 21:51:27 +01:00
Zuhayr
21a019b34f
Cleanup
2015-05-30 05:35:00 +09:30
Zuhayr
97cbcff3df
Fixes #9124
2015-05-30 05:29:33 +09:30
Zuhayr
deb806c4cb
Fixes #9076
2015-05-30 05:24:44 +09:30
Zuhayr
a3f3009eb4
Fixes #9063
2015-05-30 05:16:01 +09:30
GinjaNinja32
e8f02b8496
Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS
2015-05-29 20:36:48 +01:00
Zuhayr
b67622b23c
Fixes 9077
2015-05-30 05:06:43 +09:30
Zuhayr
5f2cf7b4a3
Fixes limbs and wounds not being visible on limbs.
2015-05-30 04:59:12 +09:30
Zuhayr
ce36d07f79
Fixes #9180
2015-05-30 04:58:49 +09:30
GinjaNinja32
58ab763010
code/datums
2015-05-29 20:13:42 +01:00
Zuhayr
4a012a90ca
Fixes #8929
2015-05-30 04:38:41 +09:30
Zuhayr
6564fd6663
Messed this up.
2015-05-30 04:06:23 +09:30
GinjaNinja32
81d23c85cc
code/ATMOSPHERICS \red \blue etc to span classes
2015-05-29 19:36:15 +01:00
Zuhayr
a4c2267984
Fixes #9386
2015-05-30 04:01:13 +09:30
Zuhayr
445056ba5f
'Fixes' #9395
2015-05-30 03:59:54 +09:30
Zuhayr
7b8abdab01
Fixes #9361
2015-05-30 03:55:41 +09:30
Zuhayr
c5df326533
Fixes #9414
2015-05-30 03:15:19 +09:30
GinjaNinja32
9546c8a5e1
Better shuttle override logging, span classes, \The, GetID() instead of typechecks
2015-05-29 18:31:21 +01:00
Zuhayr
887b8163cc
Fixes #9498
2015-05-30 02:56:01 +09:30
Zuhayr
5a339a66c1
Fixes #9510
2015-05-30 02:52:16 +09:30
