GinjaNinja32
a2e66b4095
Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix
...
Speech impediment fixes.
2015-07-02 13:54:16 +01:00
Zuhayr
9a7515af8f
Merge with dev-freeze.
2015-07-02 19:04:01 +09:30
Zuhayr
2a32150658
Merge pull request #9992 from Baystation12/master
...
Master into dev-freeze
2015-07-02 19:00:00 +09:30
Zuhayr
de39dbd1bb
Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit
...
Portable turret changes.
2015-07-02 18:36:13 +09:30
PsiOmegaDelta
db1135169d
Fixes #9986 .
...
A simple matter of a missing return line.
2015-07-02 10:43:22 +02:00
PsiOmegaDelta
a98c4a2c8e
Speech impediment fixes.
...
Fixes #9987 .
Removes unnecessary speech problem flag check.
Removes unnecessary changeling language check. Hivemind languages are excluded from speech problems already.
2015-07-02 10:04:08 +02:00
Chinsky
42a1ad8b81
Merge pull request #9985 from GinjaNinja32/teleport
...
Fixes the third teleportation effect
2015-07-02 09:13:03 +03:00
GinjaNinja32
7b1d9a54be
Fixes the third teleportation effect
...
why isn't this a proc
2015-07-02 06:36:30 +01:00
Chinsky
0b9d9167f7
Merge pull request #9980 from mwerezak/supermatter
...
Fixes #9591
2015-07-02 06:07:42 +03:00
PsiOmegaDelta
b5a47fd43b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/ai/life.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/power/rust/core_gen.dm
code/modules/power/rust/fuel_compressor_construction.dm
code/modules/power/rust/fuel_injector.dm
2015-07-01 22:46:40 +02:00
PsiOmegaDelta
977ed13e14
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/silicon/ai/life.dm
2015-07-01 22:35:00 +02:00
PsiOmegaDelta
791b9eb27d
Merge pull request #9981 from Zuhayr/antioxidant
...
Removes the RUST engine.
2015-07-01 08:31:14 +02:00
Zuhayr
8ab80b7394
Removes the RUST engine.
2015-07-01 15:50:55 +09:30
PJB3005
dcbfff8aaa
Fixes stuck lights
2015-07-01 07:59:19 +02:00
mwerezak
5ec5fdeb46
Fixes #9591
...
Adjusts supermatter radiation range and intensity
2015-07-01 01:18:14 -04:00
Chinsky
0e6aea6842
Merge pull request #9957 from mwerezak/hats
...
Updates hats to use item_state_slots where necessary
2015-07-01 06:56:21 +03:00
PsiOmega
15c165f4e5
Fixes #7042 .
...
Fixes issues with the AI centering on its core whenever it's attached to machinery.
Previously fixed on dev-freeze.
2015-06-30 20:09:10 +02:00
PsiOmega
ba630d2556
Portable turret feedback changes.
2015-06-30 16:28:00 +02:00
PsiOmegaDelta
d827e41bdf
Replaces the portable turrets on Crescent with the clean presets.
2015-06-30 15:51:26 +02:00
PsiOmegaDelta
a76c915e2e
Adds missing changelog icon to the client pre-fetch.
2015-06-30 15:13:28 +02:00
PsiOmegaDelta
b7bdd4b583
Create Crescent/ERT portable turret presets.
2015-06-30 15:08:29 +02:00
PsiOmegaDelta
001d4839f1
Fixes missing assessment check.
2015-06-30 15:03:51 +02:00
PsiOmegaDelta
beaaaa9f8a
Portable turrets are now (more or less) a single entity
2015-06-30 14:52:37 +02:00
PsiOmegaDelta
c2c4336afe
Changelog entry.
2015-06-30 09:51:38 +02:00
PsiOmegaDelta
10c2e32f4c
Now pads a 0 to single digit hours.
2015-06-30 09:50:12 +02:00
PsiOmegaDelta
cc1ca0e616
Compilation fixes.
2015-06-30 09:01:51 +02:00
PsiOmegaDelta
f420dd9f01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
2015-06-30 08:59:34 +02:00
PsiOmegaDelta
0624fced64
Compilation.. fix and ensuring the Thunderdome isn't a dark pit.
2015-06-30 08:46:32 +02:00
PsiOmegaDelta
cf10dc38b1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/game/atoms.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/silicon/silicon.dm
2015-06-30 08:24:43 +02:00
GinjaNinja32
ebf037af5e
Fixes an infinite loop issue
...
Title. reset_view() called handle_regular_hud_updates() called check_eye() called reset_view() [...]
2015-06-30 06:26:51 +01:00
Zuhayr
b0a5705fa8
Makes suits usable with the icon state system.
2015-06-30 12:15:06 +09:30
Chinsky
3a391250a2
Merge pull request #9961 from PsiOmegaDelta/150628-DroneRuntime
...
Fixes drone runtime.
2015-06-29 22:48:37 +03:00
PsiOmega
7e33beab0f
Fixes drone runtime.
...
Spawning drones no longer cause runtimes. Fixes #9909 .
2015-06-28 19:02:23 +02:00
Chinsky
9cfd04f959
Merge pull request #9952 from mwerezak/camera-console-fix
...
Fixes #7910
2015-06-28 19:42:00 +03:00
PsiOmega
85d0d6fcd3
Wrenching times no longer runtime.
...
Fixes #9175 .
2015-06-28 18:17:53 +02:00
mwerezak
4062f81f20
Fixes #7910
...
Partial port from vgstation.
Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb. check_eye() now returns the vision
flags to be set on the viewer. Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
2015-06-28 11:59:19 -04:00
Zuhayr
4a2d7b661e
Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Refactors Life() - Part II
2015-06-28 20:20:49 +09:30
PsiOmegaDelta
b482c5c07d
Merge pull request #9958 from GinjaNinja32/botfix
...
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
2015-06-28 12:48:54 +02:00
GinjaNinja32
9a9f8e5563
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
2015-06-28 11:43:53 +01:00
PsiOmegaDelta
6a808e5394
Merge pull request #9956 from GinjaNinja32/time
...
Changes time to never go higher than 23:59
2015-06-28 09:17:14 +02:00
mwerezak
263f721f3e
Updates more hats
...
Also moves hat inhands to separate dmi.
2015-06-28 01:50:05 -04:00
mwerezak
309dff6aba
One less object verb
2015-06-27 23:54:20 -04:00
mwerezak
c7ff5eebe3
Updates hats to use item_state_slots where necessary.
2015-06-27 23:33:33 -04:00
GinjaNinja32
9d57473eff
changes time to never go higher than 23:59
2015-06-28 01:34:57 +01:00
Zuhayr
f096d5cabe
Merge resolution.
2015-06-28 06:13:24 +09:30
Zuhayr
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
GinjaNinja32
3c3d6f3497
Un-breaks hats, semi-fixes #9873 , partially reverts #9937
2015-06-27 08:59:27 +01:00
Chinsky
be24aa0272
Merge pull request #9935 from GinjaNinja32/irc_notification
...
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
2015-06-27 01:09:37 +03:00
GinjaNinja32
61cd53e265
Merge pull request #9944 from Ravensdale/master
...
Remove posi-mmi-mechs
2015-06-26 21:31:02 +01:00
Ravensdale
ba3d180db6
Remove posi-mmi-mechs
...
fix
actual removal
2015-06-26 12:37:37 -07:00
