PsiOmegaDelta
|
2fc50e7d03
|
Merge pull request #9449 from mwerezak/airlock-sound
Airlock sounds
|
2015-05-24 14:43:09 +02:00 |
|
mwerezak
|
e6be73ac56
|
Airlock sounds
|
2015-05-23 22:59:18 -04:00 |
|
Zuhayr
|
50dd6aa0bb
|
Merge with master.
|
2015-05-23 21:29:40 +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 |
|
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
|
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
|
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 |
|
mwerezak
|
01e8246e64
|
Clean up world print
|
2015-05-20 00:35:26 -04:00 |
|
Zuhayr
|
a6f59edc22
|
Bit of documentation.
|
2015-05-20 14:00:14 +09:30 |
|
mwerezak
|
c289975498
|
Adds attack animation calls for a few common machines and structures
- Cameras
- Doors
- Grilles
- Windows
|
2015-05-20 00:28:57 -04:00 |
|
mwerezak
|
87178d74a6
|
Adds attack animation calls for attack_generic()
|
2015-05-20 00:19:39 -04:00 |
|
mwerezak
|
20b72b9911
|
Adds attack animation calls
|
2015-05-20 00:18:32 -04:00 |
|
Zuhayr
|
93b014c699
|
Merge with dev.
|
2015-05-20 13:39:31 +09:30 |
|
Chinsky
|
284d1cc1f5
|
Merge pull request #9360 from Kelenius/ofChemAndCarbon
Carbon now clears ingested chemicals
|
2015-05-20 01:45:13 +03:00 |
|
HarpyEagle
|
10067349b2
|
Cleans up debug prints
|
2015-05-19 17:47:51 -04:00 |
|
Neerti
|
6c16923d11
|
Fixes issue with removing dead plants from hydro treys as a borg.
|
2015-05-19 15:28:38 -04:00 |
|
Chinsky
|
8871696c52
|
Merge pull request #9353 from Ccomp5950/goat_simulator3000
Goat Buffs.
|
2015-05-19 17:56:55 +03:00 |
|
Kelenius
|
fd450561c2
|
Carbon now clears ingested chemicals
Also fixes a bug that made ethy-thing not work.
|
2015-05-19 15:41:14 +03:00 |
|
Zuhayr
|
06c04edb5e
|
Merge pull request #9337 from comma/ghettoMD
Ghetto MDing
|
2015-05-19 20:38:50 +09:30 |
|
Chinsky
|
8e46bef3d5
|
Merge pull request #9351 from PsiOmegaDelta/LateJoinAI
Fixes #9244.
|
2015-05-19 08:42:46 +03:00 |
|
Chinsky
|
df917e1538
|
Changes from PR feedback. Moar feedback for inspecting mob.
|
2015-05-19 07:16:17 +03:00 |
|
mwerezak
|
953e8be44e
|
Fire tweak
|
2015-05-19 00:09:37 -04:00 |
|
mwerezak
|
e23f5e7e06
|
Fixes hardsuit shocking
|
2015-05-18 20:09:31 -04:00 |
|