PsiOmegaDelta
7b454f193b
Ensures the drone console use the new overlay system.
2015-07-17 08:14:13 +02:00
PsiOmegaDelta
87d4cf4f68
Computers are now overlay based.
...
Computers now use an overlay based system, instead of demanding a full set of icons (on, off, broken) for every different computer.
Partially ports ParadiseSS13/Paradise#1468 which is a port of tgstation/-tg-station#9931 .
2015-07-07 17:23:49 +02:00
PsiOmega
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
Kelenius
eb64e0c5b6
Fixes a bug where mob sees visible message twice
2015-07-06 15:58:31 +03:00
Zuhayr
2129bf6c2e
Merge pull request #10014 from mwerezak/raider-gear
...
Fixes issues with equipping raiders, raider gun type
2015-07-06 05:48:25 +09:30
PsiOmega
d9af4af844
Fixes #10024 .
...
/mob/living/silicon/robot/handle_regular_hud_updates() called handle_regular_hud_updates() and then recursion kept happening.
2015-07-05 21:24:39 +02:00
mwerezak
c1bbc5c3a6
Fixes issues with raider equipping
...
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
2015-07-04 16:32:35 -04:00
PsiOmegaDelta
fb60cfde4c
Rejuvenation now clears chemicals in mobs.
...
Fixes #9921 .
2015-07-03 16:41:10 +02:00
PsiOmegaDelta
41d86361a0
Merge pull request #9999 from Baystation12/dev-freeze
...
Dev.
2015-07-02 21:24:09 +02:00
GinjaNinja32
88b9787ac4
Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket
...
Fixes #9986 .
2015-07-02 13:55:27 +01:00
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
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
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
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
a76c915e2e
Adds missing changelog icon to the client pre-fetch.
2015-06-30 15:13:28 +02:00
PsiOmegaDelta
001d4839f1
Fixes missing assessment check.
2015-06-30 15:03:51 +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
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
Zuhayr
b0a5705fa8
Makes suits usable with the icon state system.
2015-06-30 12:15:06 +09:30
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
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
mwerezak
c7ff5eebe3
Updates hats to use item_state_slots where necessary.
2015-06-27 23:33:33 -04: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
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
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
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
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -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
Chinsky
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
Chinsky
9d03286b6c
Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon.
2015-06-25 23:04:33 +03:00
Chinsky
e6b4cecf50
Fixes #9519
...
Now client can't escape the resetting!
2015-06-25 21:09:51 +03:00
PsiOmegaDelta
bca222b119
Some more disability cleanup.
2015-06-25 08:39:33 +02:00
Zuhayr
130ff67414
Merge pull request #9902 from Baystation12/dev-freeze
...
Dev freeze
2015-06-23 20:53:38 +09:30
Chinsky
8bb0f7496e
Merge pull request #9900 from mwerezak/extinguisher
...
Changelog, fire patting
2015-06-23 06:46:34 +03:00
mwerezak
4961efec0f
Adjusts patting to account for shorter timeout
2015-06-22 22:17:30 -04:00
PsiOmegaDelta
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
GinjaNinja32
9c32851ba5
Merge pull request #9871 from mwerezak/extinguisher
...
Fire Extinguishers
2015-06-22 15:36:55 +01:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
