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
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
791b9eb27d
Merge pull request #9981 from Zuhayr/antioxidant
...
Removes the RUST engine.
2015-07-01 08:31:14 +02:00
8ab80b7394
Removes the RUST engine.
2015-07-01 15:50:55 +09:30
dcbfff8aaa
Fixes stuck lights
2015-07-01 07:59:19 +02:00
5ec5fdeb46
Fixes #9591
...
Adjusts supermatter radiation range and intensity
2015-07-01 01:18:14 -04:00
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
06000a6984
Adds setMoveCooldown()
2015-06-30 22:30:12 -04:00
32b95445e3
Gives changeNextMove() a better name, default define
2015-06-30 22:29:45 -04:00
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
a76c915e2e
Adds missing changelog icon to the client pre-fetch.
2015-06-30 15:13:28 +02:00
001d4839f1
Fixes missing assessment check.
2015-06-30 15:03:51 +02:00
cc1ca0e616
Compilation fixes.
2015-06-30 09:01:51 +02:00
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
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
b0a5705fa8
Makes suits usable with the icon state system.
2015-06-30 12:15:06 +09:30
087a978d56
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
7e33beab0f
Fixes drone runtime.
...
Spawning drones no longer cause runtimes. Fixes #9909 .
2015-06-28 19:02:23 +02:00
9cfd04f959
Merge pull request #9952 from mwerezak/camera-console-fix
...
Fixes #7910
2015-06-28 19:42:00 +03:00
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
4a2d7b661e
Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Refactors Life() - Part II
2015-06-28 20:20:49 +09:30
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
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
263f721f3e
Updates more hats
...
Also moves hat inhands to separate dmi.
2015-06-28 01:50:05 -04:00
309dff6aba
One less object verb
2015-06-27 23:54:20 -04:00
c7ff5eebe3
Updates hats to use item_state_slots where necessary.
2015-06-27 23:33:33 -04:00
f096d5cabe
Merge resolution.
2015-06-28 06:13:24 +09:30
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
3c3d6f3497
Un-breaks hats, semi-fixes #9873 , partially reverts #9937
2015-06-27 08:59:27 +01:00
a3dde19498
Makes suit species_restricted handled by whitelist instead of blacklist
2015-06-27 00:51:11 -04:00
0bc7ce1119
Makes breacher rigs fit unathi only
2015-06-27 00:44:03 -04:00
e5d8b15d01
Compilation fixes.
2015-06-26 20:33:55 +02:00
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
98572db1a0
Merge pull request #9940 from atlantiscze/connection_estabilished
...
Fixes #9929
2015-06-26 19:24:24 +01:00
d1cc0517ce
Sound environment changes. Different values for hallways, carpeted rooms, maintenance tunnels, etc. Holodeck sound environment changes with the loaded program
...
In low-pressure or space, sounds will be heard in sound environment 22 (underwater))
2015-06-27 03:47:37 +10:00
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
90f08d3fa7
Fixes #9929
...
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
2015-06-26 18:22:59 +02:00
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
ed779b7ff9
Merge pull request #9937 from mwerezak/master-fixes
...
Fixes
2015-06-26 09:19:48 +03:00
c6c200c127
Fixes #9251
2015-06-26 01:38:04 -04:00
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
aae29d8b6e
Adds 'melting' and ignition points for various materials
2015-06-26 00:41:19 -04:00
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
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -04:00
ceb1832505
Tries to please Travis.
2015-06-25 20:22:52 -04:00
fcde61acdd
Fixes the sloppy merge conflict resolution.
2015-06-25 19:14:15 -04:00
462eaa834b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync
...
Conflicts:
.travis.yml
code/modules/clothing/spacesuits/rig/modules/combat.dm
code/modules/clothing/spacesuits/rig/modules/utility.dm
code/modules/mob/living/silicon/ai/ai.dm
icons/mob/rig_back.dmi
polaris.dme
2015-06-25 18:50:18 -04:00
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
78784a3d9a
Fixes #9933
...
Also potential same issue with other scalpel subtypes.
2015-06-25 23:59:12 +03:00
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
PsiOmegaDelta