PsiOmega
f96ad8ca40
NTs relationship towards you now affects the pay grade.
2015-07-02 23:03:55 +02:00
PsiOmegaDelta
8b731feb8b
Economic strength now depends on race and job.
...
The amount of money a crew member can start with is now affected by race and species.
Also fixes #8546 .
2015-07-02 20:14:35 +02: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
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
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
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
GinjaNinja32
98572db1a0
Merge pull request #9940 from atlantiscze/connection_estabilished
...
Fixes #9929
2015-06-26 19:24:24 +01: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
Atlantis
90f08d3fa7
Fixes #9929
...
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
2015-06-26 18:22:59 +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
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
GinjaNinja32
94ffb49bfb
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
2015-06-26 01:04:03 +01: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
