Zuhayr
|
3cae318716
|
Merge pull request #9370 from comma/frankenstein
Frankenstein
|
2015-05-25 13:56:40 +09:30 |
|
Zuhayr
|
161af35d6c
|
Merge pull request #9416 from Hubblenaut/dev
Makes mice pick up-able
|
2015-05-25 02:25:37 +09:30 |
|
Hubblenaut
|
7a8bbab694
|
fixup
|
2015-05-24 15:39:43 +02:00 |
|
PsiOmegaDelta
|
9a8a6a601b
|
Merge pull request #9441 from GinjaNinja32/hardsuit_click
Changes hardsuit activation button to a per-client toggle.
|
2015-05-24 14:43:34 +02:00 |
|
GinjaNinja32
|
4bad50e875
|
Gives AI/borg previews back their cardborg hats
|
2015-05-23 20:42:51 +01:00 |
|
GinjaNinja32
|
3b81d0987b
|
soft_assert addition
|
2015-05-23 19:41:42 +01:00 |
|
GinjaNinja32
|
11af65d1e0
|
Changes hardsuit activation button to a per-client toggle.
Currently toggleable between:
- middle-click (default)
- alt-click
- control-click
|
2015-05-23 14:00:09 +01:00 |
|
Zuhayr
|
5b8bf58d0d
|
Merge pull request #9439 from Baystation12/dev-freeze
Dev-freeze into dev.
|
2015-05-23 21:40:26 +09:30 |
|
Zuhayr
|
50dd6aa0bb
|
Merge with master.
|
2015-05-23 21:29:40 +09:30 |
|
Zuhayr
|
d4e45fbee8
|
Merge pull request #9327 from Techhead0/chemRenames
Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.
|
2015-05-23 20:52:58 +09:30 |
|
Zuhayr
|
cd86cad68c
|
Merge pull request #8816 from atlantiscze/nanocrusade-two
Nano Crusade 2
|
2015-05-23 20:44:28 +09:30 |
|
Zuhayr
|
a2571b95c3
|
Merge pull request #9418 from mwerezak/port-gen
Fixes portable generators going above their temperature limit
|
2015-05-23 20:40:07 +09:30 |
|
Hubblenaut
|
7564dcf843
|
Fixes merge conflict
|
2015-05-22 21:36:48 +02:00 |
|
Hubblenaut
|
a7ad448293
|
mice are pickup-able
|
2015-05-22 17:59:06 +02:00 |
|
PsiOmega
|
15756f031b
|
Fixes pulse-check text.
|
2015-05-22 14:00:42 +02:00 |
|
Chinsky
|
be24803309
|
Merge pull request #9363 from PsiOmegaDelta/PulseCheck
Pulse check
|
2015-05-22 14:35:49 +03:00 |
|
PsiOmega
|
43e0d9ca07
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-05-22 08:39:07 +02:00 |
|
PsiOmega
|
77099631d1
|
Updates del usages.
|
2015-05-22 08:27:12 +02:00 |
|
PsiOmega
|
e74c0e65bf
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/items/weapons/power_cells.dm
|
2015-05-22 08:26:13 +02:00 |
|
mwerezak
|
cf591c290b
|
Adds limit to prevent random walking below the lower limit temperature, too.
|
2015-05-22 02:21:12 -04:00 |
|
mwerezak
|
4d54742079
|
Fixes portable generators going about their temperature limit
|
2015-05-22 01:27:01 -04:00 |
|
PsiOmegaDelta
|
a677ec3b83
|
Merge pull request #9412 from Kelenius/ofChemAndReadme
Updates Chemistry-Readme.dm
|
2015-05-22 06:37:25 +02:00 |
|
PsiOmega
|
7d17f2eeb7
|
Items again have their loc set just before dropped() is called.
Fixes #9299.
Fixes #9406.
|
2015-05-21 17:55:31 +02:00 |
|
Daranz
|
e9d9ff57ba
|
Remove redundant null argument in a view() call
|
2015-05-21 10:14:40 -04:00 |
|
Daranz
|
bbc8ad6383
|
Add extra checks for Say :i
Say :i now leaves fingerprints on affected intercoms, and cannot be performed
at all if restrained.
|
2015-05-21 09:18:02 -04:00 |
|
Daranz
|
b9dbeeb356
|
Fix a problem with Say :i not working
|
2015-05-21 08:53:14 -04:00 |
|
Kelenius
|
360113850a
|
Updates Chemistry-Readme.dm
Also removes one unused variable that I forgot to remove.
|
2015-05-21 12:43:28 +03:00 |
|
Chinsky
|
ae3e80b85b
|
Merge pull request #9409 from GinjaNinja32/supply
Fixes supply shuttle
|
2015-05-21 12:30:20 +03:00 |
|
Zuhayr
|
3377f8bbf1
|
Merge pull request #9407 from GinjaNinja32/floorpainter
Fixes floor painter 'side/3 corners'->'black' and another state
|
2015-05-21 18:43:00 +09:30 |
|
Zuhayr
|
52ae206174
|
Merge pull request #9391 from comma/ghettoMD
Missed one baddie
|
2015-05-21 18:30:06 +09:30 |
|
GinjaNinja32
|
900fb32aff
|
Fixes supply shuttle
|
2015-05-21 06:58:35 +01:00 |
|
GinjaNinja32
|
0aff37a72c
|
Fixes floor painter 'side/3 corners'->'black' and another state
|
2015-05-21 06:03:15 +01:00 |
|
PsiOmegaDelta
|
558118f2c8
|
Merge pull request #9372 from GinjaNinja32/reactions
Allows reactions to happen with any level of the required chems
|
2015-05-21 06:53:51 +02:00 |
|
PsiOmegaDelta
|
66b8d67637
|
Merge pull request #9390 from mwerezak/attack-animation
Attack animations
|
2015-05-21 06:52:30 +02:00 |
|
Zuhayr
|
293fb6782c
|
Merge pull request #9387 from Yoshax/syringespls
Fixes a typo/mistake
|
2015-05-21 12:51:27 +09:30 |
|
Chinsky
|
a1d84ff176
|
Merge pull request #9385 from GinjaNinja32/structure_climb
Fixes structure climbing
|
2015-05-21 03:58:13 +03:00 |
|
Chinsky
|
cb3dea3682
|
Merge pull request #9369 from mwerezak/action-icons
Ports "Makes update_action_buttons() work on-demand"
|
2015-05-21 03:35:41 +03:00 |
|
Chinsky
|
91de5b2d9d
|
Merge pull request #9381 from GinjaNinja32/patch-1
Fixes #9380
|
2015-05-21 03:27:28 +03:00 |
|
Chinsky
|
ecc2b3c437
|
Merge pull request #9258 from mwerezak/charge
Updates instances of power cell usage
|
2015-05-21 03:24:20 +03:00 |
|
Chinsky
|
53e3e2f6e6
|
Merge pull request #9379 from Zuhayr/materials
Materials + Morguemeat icon + bat nerf
|
2015-05-21 03:23:41 +03:00 |
|
Chinsky
|
97b2a63b76
|
Missed one baddie
Pretty sure that limb rotting alive is unhealthy yeah
|
2015-05-21 03:22:20 +03:00 |
|
Chinsky
|
9d14bc41de
|
Merge pull request #9389 from mwerezak/fire
Fire
|
2015-05-21 03:13:55 +03:00 |
|
Yoshax
|
7cfb921ca0
|
Fixes a typo/mistake
|
2015-05-20 20:36:24 +01:00 |
|
GinjaNinja32
|
c345f317ac
|
Fixes structure climbing
|
2015-05-20 17:10:18 +01:00 |
|
GinjaNinja32
|
9888a8a70b
|
Another PoolOrNew(new /type, loc) fix
|
2015-05-20 16:49:18 +01:00 |
|
GinjaNinja32
|
aeb8f2a6c2
|
Fixes #9380
|
2015-05-20 16:44:47 +01:00 |
|
Zuhayr
|
71da36ec01
|
Updated force vars on bats.
|
2015-05-21 00:52:17 +09:30 |
|
Zuhayr
|
c3f0f42ec2
|
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials
|
2015-05-21 00:49:14 +09:30 |
|
Zuhayr
|
98def6e247
|
Updating dev from master.
|
2015-05-21 00:08:22 +09:30 |
|
Atlantis
|
b0334ac331
|
isrobot() fix, attempt two
|
2015-05-20 12:22:33 +02:00 |
|