PsiOmega
037a901b22
Changelog update.
2015-06-26 20:34:30 +02:00
PsiOmega
e5d8b15d01
Compilation fixes.
2015-06-26 20:33:55 +02:00
PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
PsiOmegaDelta
69704b55af
Merge pull request #9941 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-06-26 20:23:48 +02:00
PsiOmega
dd7d9b851b
Updates changelog.
2015-06-26 19:23:47 +02:00
PsiOmega
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
PsiOmegaDelta
8fef02501c
Merge pull request #9936 from mwerezak/fire
...
Balances fire to work better with very low concentration phoron gas burning
2015-06-26 13:34:21 +02:00
Chinsky
ed779b7ff9
Merge pull request #9937 from mwerezak/master-fixes
...
Fixes
2015-06-26 09:19:48 +03:00
mwerezak
c6c200c127
Fixes #9251
2015-06-26 01:38:04 -04:00
mwerezak
242f5c5dfd
Fixes #9928
2015-06-26 01:35:35 -04:00
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
PsiOmegaDelta
c9f7c773bb
Merge pull request #9932 from comma/dev-freeze
...
Fixies
2015-06-26 06:45:07 +02:00
mwerezak
aae29d8b6e
Adds 'melting' and ignition points for various materials
2015-06-26 00:41:19 -04:00
mwerezak
56065022a7
Updates fire_act() implementations to work better with lower temperature fires
...
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -04:00
mwerezak
e08dbc3080
Adjusts gas fires to burn out faster with low concentrations of gas fuel
2015-06-26 00:40:06 -04:00
Chinsky
2b97465d6b
Merge pull request #9934 from GinjaNinja32/irc_age
...
Adds 'age' command to world.Topic, for the IRC bot
2015-06-26 02:06:48 +03:00
GinjaNinja32
5906ae7556
Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors
2015-06-25 22:52:36 +01:00
Chinsky
78784a3d9a
Fixes #9933
...
Also potential same issue with other scalpel subtypes.
2015-06-25 23:59:12 +03:00
Chinsky
265b1d5b51
Fixes #9913
...
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
2015-06-25 23:51:58 +03:00
Chinsky
9d03286b6c
Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon.
2015-06-25 23:04:33 +03:00
Chinsky
5dda5021a3
Fixed a list being qdel'd when radio is deleted.
2015-06-25 23:04:04 +03:00
Chinsky
e6b4cecf50
Fixes #9519
...
Now client can't escape the resetting!
2015-06-25 21:09:51 +03:00
Chinsky
c548d2b1be
Merge pull request #9926 from PsiOmegaDelta/150625-GridCheck
...
Grid check now respects critical APC status.
2015-06-25 19:39:58 +03:00
Chinsky
0beeb863cf
Merge pull request #9922 from PsiOmegaDelta/150625-CTag
...
Fixes missing camera c_tag.
2015-06-25 19:32:14 +03:00
PsiOmegaDelta
fdab654beb
Grid check now respects critical APC status.
...
Fixes #9919 .
On power failure critical APCs are left alone, however on power restoration critical APCs are still included.
2015-06-25 14:12:05 +02:00
Zuhayr
eedbcee063
Merge pull request #9924 from Zuhayr/devupdate
...
Devupdate
2015-06-25 18:59:01 +09:30
Zuhayr
27a7768ffc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-06-25 17:58:37 +09:30
PsiOmegaDelta
203f1b321a
Fixes missing camera c_tag.
...
Prevents the camera from showing up as an invalid null entry in the camera console list.
2015-06-25 10:11:25 +02:00
GinjaNinja32
d722dfa420
Merge pull request #9911 from mwerezak/disposal
...
Disposals fixes
2015-06-25 06:14:00 +01:00
mwerezak
51eecd54f0
Fixes disposal bins filling instantly
...
Fixes disposal bins filling instantly, side effect of fixing
air_contents having the wrong volume
2015-06-24 22:09:47 -04:00
PsiOmegaDelta
688a85cfde
Merge pull request #9915 from PsiOmegaDelta/dev
...
Dev
2015-06-24 18:49:42 +02:00
PsiOmega
8843aa2402
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/alarm.dm
html/changelogs/.all_changelog.yml
2015-06-24 18:15:28 +02:00
PsiOmegaDelta
0277d3452a
Merge pull request #9914 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-06-24 18:14:39 +02:00
PsiOmega
0e471be0e6
Updates changelog.
2015-06-24 17:31:07 +02:00
PsiOmega
8a9f5b9365
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-24 17:30:18 +02:00
Zuhayr
c688678444
Merge pull request #9912 from mwerezak/grillehit
...
Fixes #9910
2015-06-24 17:28:04 +09:30
mwerezak
aa0b23e205
Fixes #9910
2015-06-24 00:20:11 -04:00
mwerezak
cb0b3a30da
Fixes runtime
...
Fixes the other runtime in #9310
2015-06-24 00:13:41 -04:00
mwerezak
a147a4e15e
Removes fat mutation checks
2015-06-23 23:36:19 -04:00
mwerezak
285ce84044
Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix
...
Fixes one of the runtimes in #9310
2015-06-23 23:32:27 -04:00
Ccomp5950
9f8f075df0
Merge pull request #9904 from PsiOmegaDelta/150623-Cables
...
Fixes #9813 .
2015-06-23 12:22:47 -04:00
PsiOmega
3b935ce854
Fixes #9813 .
...
Cutting fire alarm wiring now produces cables.
2015-06-23 18:15:30 +02:00
Zuhayr
130ff67414
Merge pull request #9902 from Baystation12/dev-freeze
...
Dev freeze
2015-06-23 20:53:38 +09:30
Chinsky
8bb0f7496e
Merge pull request #9900 from mwerezak/extinguisher
...
Changelog, fire patting
2015-06-23 06:46:34 +03:00
mwerezak
649c59cbc6
Updates changelog
2015-06-22 23:34:22 -04:00
mwerezak
4961efec0f
Adjusts patting to account for shorter timeout
2015-06-22 22:17:30 -04:00
PsiOmegaDelta
76cf3b8782
Merge pull request #9898 from PsiOmegaDelta/dev
...
Dev
2015-06-22 17:12:15 +02:00
PsiOmegaDelta
f7474f926f
Updates changelog.
2015-06-22 17:00:10 +02:00
PsiOmegaDelta
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
